commit 13a3d43a9020141f50a2dd5a770b7149136ebd65
author ashestakov <ashestakov@mirantis.com> Tue Feb 27 13:59:04 2018 +0000
committer Andrey Shestakov <ashestakov@mirantis.com> Fri Mar 02 09:54:52 2018 +0000
tree 75882654c2090e9337a2d2db291a70e95cbc94c3
parent 85ab8789440f88e5ad5e0178207aac9ba6bda1d5

Adjust reclass definitions for k8s calico refactoring.

Change-Id: I2e651cd14ebe8a82e8ef96eb38d27d97a3fcb814

kubernetes/master/cluster.yml

diff --git a/kubernetes/master/cluster.yml b/kubernetes/master/cluster.yml
index f21f003..5db89c6 100644
--- a/kubernetes/master/cluster.yml
+++ b/kubernetes/master/cluster.yml
@@ -12,6 +12,6 @@
       container: false
       network:
         engine: calico
-        private_ip_range: ${_param:calico_private_network}/${_param:calico_private_netmask}
-        prometheus:
-          enabled: true
+        calico:
+          prometheus:
+            enabled: true

kubernetes/pool/cluster.yml

diff --git a/kubernetes/pool/cluster.yml b/kubernetes/pool/cluster.yml
index 3dd0c40..2491dce 100644
--- a/kubernetes/pool/cluster.yml
+++ b/kubernetes/pool/cluster.yml
@@ -4,7 +4,7 @@
 parameters:
   _param:
     # component docker images
-    kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+    kubernetes_calico_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
     kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
     kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
     kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
@@ -16,8 +16,9 @@
       container: false
       network:
         engine: calico
-        prometheus:
-          enabled: true
+        calico:
+          prometheus:
+            enabled: true
   docker:
     host:
       options:

kubernetes/pool/single.yml

diff --git a/kubernetes/pool/single.yml b/kubernetes/pool/single.yml
index 67363a6..883114b 100644
--- a/kubernetes/pool/single.yml
+++ b/kubernetes/pool/single.yml
@@ -4,7 +4,7 @@
 parameters:
   _param:
     # component docker images
-    kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+    kubernetes_calico_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
     kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
     kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
     kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2