commit bb05ea3f52b37acbb93dbc757565fd6aed3039eb
author Matthew Mosesohn <mmosesohn@mirantis.com> Thu Jun 01 16:40:21 2017 +0300
committer Matthew Mosesohn <mmosesohn@mirantis.com> Thu Jun 01 14:27:23 2017 +0000
tree 5280977ca588f82543346de6867f04225b659844
parent 24270cc7dbe948739218d1fd5b94a887ffc6b3f8

Fix overwrite for kubernetes images

Now uses overrides.yml instead of overwrite.yml

Change-Id: Ia16e8f1cb3c70261599dc4cf3fcce893442d8f24

classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml

diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index 6a147f1..8ac1e8a 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -5,9 +5,8 @@
 - system.salt.minion.cert.etcd_client
 - cluster.virtual-mcp11-k8s-contrail.infra
 - cluster.virtual-mcp11-k8s-contrail.opencontrail.compute
+- cluster.overrides
 parameters:
-  _param:
-    kubernetes_hyperkube_image: docker-prod-virtual.sandbox.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
   linux:
     network:
       interface:
@@ -39,11 +38,11 @@
         etcd:
           ssl:
             enabled: true
-        image: docker-prod-virtual.sandbox.mirantis.net/mirantis/projectcalico/calico/node:latest
+        image: ${_param:kubernetes_calico_image}
         calicoctl:
-          image: docker-prod-virtual.sandbox.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+          image: ${_param:kubernetes_calicoctl_image}
         cni:
-          image: docker-prod-virtual.sandbox.mirantis.net/mirantis/projectcalico/calico/cni:latest
+          image: ${_param:kubernetes_calico_cni_image}
     common:
       hyperkube:
         image: ${_param:kubernetes_hyperkube_image}