commit 6f4f6c04a230bb5de8d26e2113d0f9a01a1abe97
author Matthew Mosesohn <mmosesohn@mirantis.com> Mon Jul 03 16:58:50 2017 +0300
committer Sergii Golovatiuk <sgolovatiuk@mirantis.com> Thu Jul 13 12:26:14 2017 +0200
tree c9b67454d11451a3acf167ab6d5ba1c34fb8d4b0
parent 6f2c4876d6af91ab1b6d0b2fc4df9d27016b9e8d

Refactor contrail-network-controller

* Rename kube-network-manager to contrail-network-controller
* Download image from artifactory rather than from docker hib

Change-Id: I35f543ba8008b5e3f8e5a27c00b5b7c88d7ee385
Signed-off-by: Sergii Golovatiuk <sgolovatiuk@mirantis.com>

metadata/service/master/cluster.yml

diff --git a/metadata/service/master/cluster.yml b/metadata/service/master/cluster.yml
index 313409b..a7377c7 100644
--- a/metadata/service/master/cluster.yml
+++ b/metadata/service/master/cluster.yml
@@ -65,10 +65,10 @@
           enabled: False
           image: calico/kube-policy-controller:v0.5.4
           namespace: kube-system
-        kube_network_manager:
-          enabled: False
-          name: network-manager
-          creates: deployment
+        contrail_network_controller:
+          enabled: true
+          namespace: kube-system
+          image: yashulyak/contrail-controller:latest
         virtlet:
           enabled: False
           namespace: kube-system

metadata/service/master/single.yml

diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml
index 0c815fe..14d9656 100644
--- a/metadata/service/master/single.yml
+++ b/metadata/service/master/single.yml
@@ -53,6 +53,10 @@
           enabled: False
           image: calico/kube-policy-controller:v0.5.4
           namespace: kube-system
+        contrail_network_controller:
+          enabled: true
+          namespace: kube-system
+          image: yashulyak/contrail-controller:latest
         virtlet:
           enabled: False
           namespace: kube-system