commit 707f7d870d4856e199758ba6869aa2b1cf2424c7
author Sergii Golovatiuk <sgolovatiuk@mirantis.com> Mon Aug 07 15:49:23 2017 +0200
committer Tomas Kukral <tkukral@mirantis.com> Thu Aug 10 12:33:31 2017 +0000
tree 73bb729b5cda7836050f0976f8776259cf0aa879
parent 94c6946e65d9df8197c07d0b40f786e067095b5b

Move addons to common section

* Move addons to common section of metadata
* Add conditional logic to install criproxy when virtlet is enabled
* Adding -%} to remove empty lines produced by jinja

Doc-Impact

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

tests/pillar/master_contrail4_0.sls

diff --git a/tests/pillar/master_contrail4_0.sls b/tests/pillar/master_contrail4_0.sls
index a7f5d93..202b25d 100644
--- a/tests/pillar/master_contrail4_0.sls
+++ b/tests/pillar/master_contrail4_0.sls
@@ -4,9 +4,8 @@
     network:
       engine: opencontrail
     hyperkube:
-      image: hyperkube-amd64:v1.5.0-beta.3-1
-  master:
-    service_addresses: 127.0.0.1/24
+      image: hyperkube-amd64:v1.6.4-3
+      hash: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd
     addons:
       dns:
         domain: cluster.local
@@ -32,6 +31,19 @@
         server_image: image
         agent_image: image
         agent_probeurls: "http://ipinfo.io"
+      calico_policy:
+        enabled: true
+        namespace: kube-system
+        image: image
+      virtlet:
+        enabled: true
+        namespace: kube-system
+        image: mirantis/virtlet:v0.7.0
+        hosts:
+        - cmp01
+        - cmp02
+  master:
+    service_addresses: 127.0.0.1/24
     admin:
       password: password
       username: admin
@@ -100,5 +112,3 @@
         enabled: true
       netchecker:
         enabled: true
-    hyperkube:
-      hash: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd