commit e19660a737c84c44c5194c3c1e83417ed6affe72
author ashestakov <ashestakov@mirantis.com> Mon Mar 05 12:43:30 2018 +0000
committer Andrey Shestakov <ashestakov@mirantis.com> Wed Mar 07 11:29:32 2018 +0200
tree 869b5a4b3474e7196d089e52346cd076e39f17f8
parent a7b8d35a6417389e7332cff4090ac1c1140aabb3

Refactor k8s network section definitions. Contrail part.

Change-Id: I33f43f93bd748b2014585ff8a82510f92388223f

tests/pillar/master_contrail.sls

diff --git a/tests/pillar/master_contrail.sls b/tests/pillar/master_contrail.sls
index c9b2ab3..a023108 100644
--- a/tests/pillar/master_contrail.sls
+++ b/tests/pillar/master_contrail.sls
@@ -75,20 +75,21 @@
       allow_privileged: true
     network:
       engine: opencontrail
-      config:
-        api:
-          host: 10.0.170.70
-      port: 8082
-      default_domain: default-domain
-      default_project: default-domain:default-project
-      public_network: default-domain:default-project:Public
-      public_ip_range: 185.22.97.128/26
-      private_ip_range: 10.150.0.0/16
-      service_cluster_ip_range: 10.254.0.0/16
-      network_label: name
-      service_label: uses
-      cluster_service: kube-system/default
-      image: tianon/true
+      contrail:
+        config:
+          api:
+            host: 10.0.170.70
+        port: 8082
+        default_domain: default-domain
+        default_project: default-domain:default-project
+        public_network: default-domain:default-project:Public
+        public_ip_range: 185.22.97.128/26
+        private_ip_range: 10.150.0.0/16
+        service_cluster_ip_range: 10.254.0.0/16
+        network_label: name
+        service_label: uses
+        cluster_service: kube-system/default
+        image: tianon/true
     service_addresses: 10.254.0.0/16
     storage:
       engine: glusterfs