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>
diff --git a/tests/pillar/master_cluster.sls b/tests/pillar/master_cluster.sls
index a904a72..af99ceb 100644
--- a/tests/pillar/master_cluster.sls
+++ b/tests/pillar/master_cluster.sls
@@ -4,8 +4,8 @@
network:
engine: none
hyperkube:
- image: hyperkube-amd64:v1.5.0-beta.3-1
- master:
+ image: hyperkube-amd64:v1.6.4-3
+ hash: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd
addons:
dns:
domain: cluster.local
@@ -41,7 +41,8 @@
hosts:
- cmp01
- cmp02
- image: mirantis/virtlet:latest
+ image: mirantis/virtlet:v0.7.0
+ master:
admin:
password: password
username: admin
@@ -103,5 +104,3 @@
enabled: true
netchecker:
enabled: true
- hyperkube:
- hash: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd
diff --git a/tests/pillar/master_contrail.sls b/tests/pillar/master_contrail.sls
index 667783e..ff03327 100644
--- a/tests/pillar/master_contrail.sls
+++ b/tests/pillar/master_contrail.sls
@@ -4,8 +4,8 @@
network:
engine: opencontrail
hyperkube:
- image: hyperkube-amd64:v1.5.0-beta.3-1
- master:
+ image: hyperkube-amd64:v1.6.4-3
+ hash: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd
addons:
dns:
domain: cluster.local
@@ -35,10 +35,18 @@
enabled: true
namespace: kube-system
image: image
+ virtlet:
+ enabled: true
+ namespace: kube-system
+ image: mirantis/virtlet:v0.7.0
+ hosts:
+ - cmp01
+ - cmp02
contrail_network_controller:
enabled: true
namespace: kube-system
image: yashulyak/contrail-controller:latest
+ master:
admin:
password: password
username: admin
@@ -103,5 +111,3 @@
enabled: true
netchecker:
enabled: true
- hyperkube:
- hash: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd
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
diff --git a/tests/pillar/pool_cluster.sls b/tests/pillar/pool_cluster.sls
index f9d06f4..ce9769c 100644
--- a/tests/pillar/pool_cluster.sls
+++ b/tests/pillar/pool_cluster.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
@@ -48,5 +62,3 @@
port: 4001
- host: 127.0.0.1
port: 4001
- hyperkube:
- hash: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd
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