| commit | adebbfcb3a82b92e3dd84ace0322e613cd2a0d39 | [log] [tgz] |
|---|---|---|
| author | Andrey Shestakov <ashestakov@mirantis.com> | Wed Mar 07 11:37:23 2018 +0200 |
| committer | Andrey Shestakov <ashestakov@mirantis.com> | Wed Mar 07 09:38:45 2018 +0000 |
| tree | 6f7be505438396bf163feb4b6d36d750e523fa83 | |
| parent | 35437e6cc77cc5716e4a16177b77b3e863760be3 [diff] |
Change k8s network.engine to network.cnis list. Change-Id: I43d26f79bed68e32c189f04120769427b7eccc81
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml index c41b40f..4408379 100644 --- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml +++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
@@ -15,6 +15,8 @@ kubelet: fail_on_swap: ${_param:kubelet_fail_on_swap} network: + cnis: + - calico calico: image: ${_param:kubernetes_calico_image} calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml index aff2a3f..3718aa4 100644 --- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml +++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -46,6 +46,8 @@ ssl: enabled: true network: + cnis: + - calico calico: etcd: ssl: