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/pool_contrail4_0.sls

diff --git a/tests/pillar/pool_contrail4_0.sls b/tests/pillar/pool_contrail4_0.sls
index 6cce55d..a4680fc 100644
--- a/tests/pillar/pool_contrail4_0.sls
+++ b/tests/pillar/pool_contrail4_0.sls
@@ -4,7 +4,23 @@
     network:
       engine: none
     hyperkube:
-      image: hyperkube-amd64:v1.5.0-beta.3-1
+      image: hyperkube-amd64:v1.6.4-3
+      hash: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd
+    addons:
+      dns:
+        domain: cluster.local
+        enabled: false
+        replicas: 1
+        server: 10.254.0.10
+        autoscaler:
+          enabled: true
+      virtlet:
+        enabled: true
+        namespace: kube-system
+        image: mirantis/virtlet:v0.7.0
+        hosts:
+        - cmp01
+        - cmp02
   pool:
     enabled: true
     version: v1.2.0
@@ -19,8 +35,6 @@
         - host: 127.0.0.1
         - host: 127.0.0.1
     address: 0.0.0.0
-    cluster_dns: 10.254.0.10
-    cluster_domain: cluster.local
     kubelet:
       config: /etc/kubernetes/manifests
       allow_privileged: True
@@ -35,5 +49,3 @@
       config:
         api:
           host: 127.0.0.1
-    hyperkube:
-      hash: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd