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/control.yml

diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
index 188c379..9ff2d53 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -5,12 +5,11 @@
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
 - cluster.virtual-mcp11-k8s-contrail.kubernetes.compute
+- cluster.overrides
 parameters:
   _param:
     keepalived_vip_interface: vhost0
     keepalived_vip_virtual_router_id: 60
-    kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
-    kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
   etcd:
     server:
       source: