commit 13b1edb4d520e07ab08de3b0021afe4834821cbc
author Tomáš Kukrál <tkukral@mirantis.com> Thu Jun 08 16:47:34 2017 +0200
committer Tomas Kukral <tkukral@mirantis.com> Tue Jun 13 15:12:25 2017 +0000
tree c69577bd135cab251fdbec0b96f353d5651abab2
parent 2171b1fc0104d1b00714dfdccbb6aa1e0b681863

switch kube-network-manager to addon

Change-Id: I65910352eae2f769720bca775041cdd1a34521a9

README.rst

diff --git a/README.rst b/README.rst
index 011617b..7e236e6 100644
--- a/README.rst
+++ b/README.rst
@@ -239,6 +239,10 @@
 
     kubernetes:
       master:
+        addons:
+          kube_network_manager:
+            enabled: true
+            namespace: kube-system
         network:
           engine: opencontrail
           host: 10.0.170.70
@@ -252,10 +256,7 @@
           network_label: name
           service_label: uses
           cluster_service: kube-system/default
-          network_manager:
-            image: pupapaik/opencontrail-kube-network-manager
-            tag: release-1.1-jpa-final-1
-
+          image: yashulyak/contrail-controller:latest
 On pools:
 
 .. code-block:: yaml
@@ -265,6 +266,16 @@
         network:
           engine: opencontrail
 
+
+Dashboard public IP must be configured when Contrail network is used:
+
+.. code-block:: yaml
+
+    kubernetes:
+      master:
+        addons:
+          public_ip: 1.1.1.1
+
 Kubernetes control plane running in systemd
 -------------------------------------------