commit a7b8d35a6417389e7332cff4090ac1c1140aabb3
author ashestakov <ashestakov@mirantis.com> Tue Feb 27 13:54:27 2018 +0000
committer Andrey Shestakov <ashestakov@mirantis.com> Tue Mar 06 20:18:48 2018 +0200
tree 5bb7e62fff08d7d5f2dc30bb3806f4d893f135bc
parent 78166b4b99fc3f0a44748459b855f2e80ec0a4f5

Refactor k8s network section definitions. Calico part

In this patch all calico related parameters are moved to
'network.calico' subsection.

Also added small fixes for deployment.

Change-Id: I32882487455f47c84a87511e384be32e9ed42622

tests/pillar/pool_cluster.sls

diff --git a/tests/pillar/pool_cluster.sls b/tests/pillar/pool_cluster.sls
index 1dc2f0b..677d7b2 100644
--- a/tests/pillar/pool_cluster.sls
+++ b/tests/pillar/pool_cluster.sls
@@ -50,21 +50,15 @@
       kube_proxy: DFvQ8GelB7afH3wClC9romaMPhquyyEe
     ca: kubernetes
     network:
-      calicoctl:
-        image: calico/ctl
-      cni:
-        image: calico/cni
       engine: calico
-      hash: c15ae251b633109e63bf128c2fbbc34a
-      ipam:
-        hash: 6e6d7fac0567a8d90a334dcbfd019a99
-        version: v1.3.1
-      version: v0.20.0
-      etcd:
-        members:
-        - host: 127.0.0.1
-          port: 4001
-        - host: 127.0.0.1
-          port: 4001
-        - host: 127.0.0.1
-          port: 4001
+      calico:
+        calicoctl_image: calico/ctl
+        cni_image: calico/cni
+        etcd:
+          members:
+          - host: 127.0.0.1
+            port: 4001
+          - host: 127.0.0.1
+            port: 4001
+          - host: 127.0.0.1
+            port: 4001