commit d389a5a817a24a20ba3bec80748814754ae5a178
author Andrey Shestakov <ashestakov@mirantis.com> Mon Mar 12 18:00:52 2018 +0200
committer Andrey Shestakov <ashestakov@mirantis.com> Thu Mar 15 15:45:22 2018 +0200
tree 736cbe2b0075d06201a873c3c21cbbd3790ad520
parent 5ca033f73e32be02cbd4423648d69aa719c6d628

Fix backward compatibility with single network engine definitions.

Change-Id: Ib022b5b3bfdac630312c97b06ca100b0ef4a1673

README.rst

diff --git a/README.rst b/README.rst
index 799495a..6b509c3 100644
--- a/README.rst
+++ b/README.rst
@@ -318,8 +318,8 @@
           kubelet:
             allow_privileged: true
           network:
-            cnis:
-            - calico
+            calico:
+              enabled: true
           service_addresses: 10.254.0.0/16
           storage:
             engine: glusterfs
@@ -364,8 +364,8 @@
               - host: 10.0.175.100
             host: 10.0.175.100
           network:
-            cnis:
-            - calico
+            calico:
+              enabled: true
           token:
             kube_proxy: DFvQ8GelB7afH3wClC9romaMPhquyyEe
             kubelet: 7bN5hJ9JD4fKjnFTkUKsvVNfuyEddw3r
@@ -418,9 +418,8 @@
             image: yashulyak/contrail-controller:latest
       master:
         network:
-          cnis:
-          - opencontrail
-          contrail:
+          opencontrail:
+            enabled: true
             default_domain: default-domain
             default_project: default-domain:default-project
             public_network: default-domain:default-project:Public
@@ -440,8 +439,8 @@
     kubernetes:
       pool:
         network:
-          cnis:
-          - opencontrail
+          opencontrail:
+            enabled: true
 
 
 Dashboard public IP must be configured when Contrail network is used:
@@ -487,8 +486,8 @@
     kubernetes:
       master:
         network:
-          cnis:
-          - flannel
+          flannel:
+            enabled: true
 
 On pools:
 
@@ -497,8 +496,8 @@
     kubernetes:
       pool:
         network:
-          cnis:
-          - flannel
+          flannel:
+            enabled: true
 
 Kubernetes with Calico
 -----------------------
@@ -510,9 +509,8 @@
     kubernetes:
       master:
         network:
-          cnis:
-          - calico
           calico:
+            enabled: true
             mtu: 1500
     # If you don't register master as node:
             etcd:
@@ -531,9 +529,8 @@
     kubernetes:
       pool:
         network:
-          cnis:
-          - calico
           calico:
+            enabled: true
             mtu: 1500
             etcd:
               members:
@@ -551,17 +548,15 @@
     kubernetes:
       pool:
         network:
-          cnis:
-          - calico
           calico:
+            enabled: true
             etcd:
               ssl:
                 enabled: true
       master:
         network:
-          cnis:
-          - calico
           calico:
+            enabled: true
             etcd:
               ssl:
                 enabled: true
@@ -573,16 +568,16 @@
     kubernetes:
       pool:
         network:
-          cnis:
-          - calico
+          calico:
+            enabled: true
           addons:
             calico_policy:
               enabled: true
 
       master:
         network:
-          cnis:
-          - calico
+          calico:
+            enabled: true
           addons:
             calico_policy:
               enabled: true