Move addons to common section
Change-Id: I39af764601fb84704ba3876f957da10f9ad9e932
Signed-off-by: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
diff --git a/classes/cluster/k8s_aio_calico/kubernetes/control.yml b/classes/cluster/k8s_aio_calico/kubernetes/control.yml
index 8ac609d..e353b1a 100644
--- a/classes/cluster/k8s_aio_calico/kubernetes/control.yml
+++ b/classes/cluster/k8s_aio_calico/kubernetes/control.yml
@@ -21,6 +21,12 @@
key: /calico/v1/ipam/v4/pool/${_param:calico_private_network}-${_param:calico_private_netmask}
value: '{"masquerade":true,"cidr":"${_param:calico_private_network}/${_param:calico_private_netmask}"}'
kubernetes:
+ common:
+ addons:
+ netchecker:
+ enabled: true
+ helm:
+ enabled: true
master:
etcd:
ssl:
@@ -32,8 +38,4 @@
namespace:
netchecker:
enabled: true
- addons:
- netchecker:
- enabled: true
- helm:
- enabled: true
+
diff --git a/classes/cluster/k8s_aio_contrail/kubernetes/control.yml b/classes/cluster/k8s_aio_contrail/kubernetes/control.yml
index 304a82f..1388fd0 100644
--- a/classes/cluster/k8s_aio_contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s_aio_contrail/kubernetes/control.yml
@@ -21,6 +21,14 @@
key: /calico/v1/ipam/v4/pool/${_param:calico_private_network}-${_param:calico_private_netmask}
value: '{"masquerade":true,"cidr":"${_param:calico_private_network}/${_param:calico_private_netmask}"}'
kubernetes:
+ common:
+ addons:
+ netchecker:
+ enabled: true
+ agent_image: ${_param:kubernetes_netchecker_agent_image}
+ server_image: ${_param:kubernetes_netchecker_server_image}
+ helm:
+ enabled: true
master:
etcd:
ssl:
@@ -32,13 +40,6 @@
namespace:
netchecker:
enabled: true
- addons:
- netchecker:
- enabled: true
- agent_image: ${_param:kubernetes_netchecker_agent_image}
- server_image: ${_param:kubernetes_netchecker_server_image}
- helm:
- enabled: true
network:
engine: opencontrail
public_ip_range: 185.22.97.128/26
diff --git a/classes/cluster/k8s_ha_calico/kubernetes/control.yml b/classes/cluster/k8s_ha_calico/kubernetes/control.yml
index 1003ff7..d438c5a 100644
--- a/classes/cluster/k8s_ha_calico/kubernetes/control.yml
+++ b/classes/cluster/k8s_ha_calico/kubernetes/control.yml
@@ -21,6 +21,12 @@
key: /calico/v1/ipam/v4/pool/${_param:calico_private_network}-${_param:calico_private_netmask}
value: '{"masquerade":true,"cidr":"${_param:calico_private_network}/${_param:calico_private_netmask}"}'
kubernetes:
+ common:
+ addons:
+ netchecker:
+ enabled: true
+ helm:
+ enabled: true
master:
etcd:
ssl:
@@ -32,8 +38,3 @@
namespace:
netchecker:
enabled: true
- addons:
- netchecker:
- enabled: true
- helm:
- enabled: true
diff --git a/classes/cluster/k8s_ha_calico_syndic/kubernetes/control.yml b/classes/cluster/k8s_ha_calico_syndic/kubernetes/control.yml
index 14772c9..1beef82 100644
--- a/classes/cluster/k8s_ha_calico_syndic/kubernetes/control.yml
+++ b/classes/cluster/k8s_ha_calico_syndic/kubernetes/control.yml
@@ -21,6 +21,12 @@
key: /calico/v1/ipam/v4/pool/${_param:calico_private_network}-${_param:calico_private_netmask}
value: '{"masquerade":true,"cidr":"${_param:calico_private_network}/${_param:calico_private_netmask}"}'
kubernetes:
+ common:
+ addons:
+ netchecker:
+ enabled: true
+ helm:
+ enabled: true
master:
etcd:
ssl:
@@ -32,8 +38,3 @@
namespace:
netchecker:
enabled: true
- addons:
- netchecker:
- enabled: true
- helm:
- enabled: true
diff --git a/classes/cluster/k8s_ha_contrail/kubernetes/control.yml b/classes/cluster/k8s_ha_contrail/kubernetes/control.yml
index 198b6ab..7be0d64 100644
--- a/classes/cluster/k8s_ha_contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s_ha_contrail/kubernetes/control.yml
@@ -21,6 +21,14 @@
key: /calico/v1/ipam/v4/pool/${_param:calico_private_network}-${_param:calico_private_netmask}
value: '{"masquerade":true,"cidr":"${_param:calico_private_network}/${_param:calico_private_netmask}"}'
kubernetes:
+ common:
+ addons:
+ netchecker:
+ enabled: true
+ agent_image: ${_param:kubernetes_netchecker_agent_image}
+ server_image: ${_param:kubernetes_netchecker_server_image}
+ helm:
+ enabled: true
master:
etcd:
ssl:
@@ -32,13 +40,6 @@
namespace:
netchecker:
enabled: true
- addons:
- netchecker:
- enabled: true
- agent_image: ${_param:kubernetes_netchecker_agent_image}
- server_image: ${_param:kubernetes_netchecker_server_image}
- helm:
- enabled: true
network:
engine: opencontrail
public_ip_range: 185.22.97.128/26
diff --git a/classes/cluster/sl_k8s_calico/kubernetes/control.yml b/classes/cluster/sl_k8s_calico/kubernetes/control.yml
index d544dd0..d743dea 100644
--- a/classes/cluster/sl_k8s_calico/kubernetes/control.yml
+++ b/classes/cluster/sl_k8s_calico/kubernetes/control.yml
@@ -21,6 +21,12 @@
key: /calico/v1/ipam/v4/pool/${_param:calico_private_network}-${_param:calico_private_netmask}
value: '{"masquerade":true,"cidr":"${_param:calico_private_network}/${_param:calico_private_netmask}"}'
kubernetes:
+ common:
+ addons:
+ netchecker:
+ enabled: true
+ helm:
+ enabled: true
master:
etcd:
ssl:
@@ -32,8 +38,3 @@
namespace:
netchecker:
enabled: true
- addons:
- netchecker:
- enabled: true
- helm:
- enabled: true
diff --git a/classes/cluster/sl_k8s_contrail/kubernetes/control.yml b/classes/cluster/sl_k8s_contrail/kubernetes/control.yml
index 2b870a1..0ef115d 100644
--- a/classes/cluster/sl_k8s_contrail/kubernetes/control.yml
+++ b/classes/cluster/sl_k8s_contrail/kubernetes/control.yml
@@ -21,6 +21,14 @@
key: /calico/v1/ipam/v4/pool/${_param:calico_private_network}-${_param:calico_private_netmask}
value: '{"masquerade":true,"cidr":"${_param:calico_private_network}/${_param:calico_private_netmask}"}'
kubernetes:
+ common:
+ addons:
+ netchecker:
+ enabled: true
+ agent_image: ${_param:kubernetes_netchecker_agent_image}
+ server_image: ${_param:kubernetes_netchecker_server_image}
+ helm:
+ enabled: true
master:
etcd:
ssl:
@@ -32,13 +40,6 @@
namespace:
netchecker:
enabled: true
- addons:
- netchecker:
- enabled: true
- agent_image: ${_param:kubernetes_netchecker_agent_image}
- server_image: ${_param:kubernetes_netchecker_server_image}
- helm:
- enabled: true
network:
engine: opencontrail
public_ip_range: 185.22.97.128/26
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
index 727da7b..4d4c9f3 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
@@ -22,6 +22,17 @@
key: /calico/v1/ipam/v4/pool/${_param:calico_private_network}-${_param:calico_private_netmask}
value: '{"masquerade":true,"cidr":"${_param:calico_private_network}/${_param:calico_private_netmask}"}'
kubernetes:
+ common:
+ addons:
+ helm:
+ enabled: ${_param:kubernetes_helm_enabled}
+ calico_policy:
+ enabled: ${_param:kubernetes_calico_policy_enabled}
+ image: ${_param:kubernetes_calico_policy_image}
+ netchecker:
+ enabled: ${_param:kubernetes_netchecker_enabled}
+ agent_image: ${_param:kubernetes_netchecker_agent_image}
+ server_image: ${_param:kubernetes_netchecker_server_image}
master:
etcd:
ssl:
@@ -33,13 +44,4 @@
namespace:
netchecker:
enabled: ${_param:kubernetes_netchecker_enabled}
- addons:
- helm:
- enabled: ${_param:kubernetes_helm_enabled}
- calico_policy:
- enabled: ${_param:kubernetes_calico_policy_enabled}
- image: ${_param:kubernetes_calico_policy_image}
- netchecker:
- enabled: ${_param:kubernetes_netchecker_enabled}
- agent_image: ${_param:kubernetes_netchecker_agent_image}
- server_image: ${_param:kubernetes_netchecker_server_image}
+
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
index bb836a9..1ca4508 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
@@ -22,17 +22,7 @@
key: /calico/v1/ipam/v4/pool/${_param:calico_private_network}-${_param:calico_private_netmask}
value: '{"masquerade":true,"cidr":"${_param:calico_private_network}/${_param:calico_private_netmask}"}'
kubernetes:
- master:
- etcd:
- ssl:
- enabled: true
- network:
- etcd:
- ssl:
- enabled: true
- namespace:
- netchecker:
- enabled: ${_param:kubernetes_netchecker_enabled}
+ common:
addons:
helm:
enabled: ${_param:kubernetes_helm_enabled}
@@ -44,3 +34,15 @@
agent_image: ${_param:kubernetes_netchecker_agent_image}
server_image: ${_param:kubernetes_netchecker_server_image}
agent_probeurls: ${_param:kubernetes_netchecker_agent_probeurls}
+ master:
+ etcd:
+ ssl:
+ enabled: true
+ network:
+ etcd:
+ ssl:
+ enabled: true
+ namespace:
+ netchecker:
+ enabled: ${_param:kubernetes_netchecker_enabled}
+
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
index 0c15550..ba33434 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -22,6 +22,17 @@
key: /calico/v1/ipam/v4/pool/${_param:calico_private_network}-${_param:calico_private_netmask}
value: '{"masquerade":true,"cidr":"${_param:calico_private_network}/${_param:calico_private_netmask}"}'
kubernetes:
+ common:
+ addons:
+ helm:
+ enabled: ${_param:kubernetes_helm_enabled}
+ calico_policy:
+ enabled: ${_param:kubernetes_calico_policy_enabled}
+ image: ${_param:kubernetes_calico_policy_image}
+ netchecker:
+ enabled: ${_param:kubernetes_netchecker_enabled}
+ agent_image: ${_param:kubernetes_netchecker_agent_image}
+ server_image: ${_param:kubernetes_netchecker_server_image}
master:
etcd:
ssl:
@@ -33,13 +44,4 @@
namespace:
netchecker:
enabled: ${_param:kubernetes_netchecker_enabled}
- addons:
- helm:
- enabled: ${_param:kubernetes_helm_enabled}
- calico_policy:
- enabled: ${_param:kubernetes_calico_policy_enabled}
- image: ${_param:kubernetes_calico_policy_image}
- netchecker:
- enabled: ${_param:kubernetes_netchecker_enabled}
- agent_image: ${_param:kubernetes_netchecker_agent_image}
- server_image: ${_param:kubernetes_netchecker_server_image}
+
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
index 966866a..0a87c12 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -21,6 +21,27 @@
key: /calico/v1/ipam/v4/pool/${_param:calico_private_network}-${_param:calico_private_netmask}
value: '{"masquerade":true,"cidr":"${_param:calico_private_network}/${_param:calico_private_netmask}"}'
kubernetes:
+ common:
+ addons:
+ dashboard:
+ enabled: false
+ helm:
+ enabled: ${_param:kubernetes_helm_enabled}
+ netchecker:
+ enabled: ${_param:kubernetes_netchecker_enabled}
+ agent_image: ${_param:kubernetes_netchecker_agent_image}
+ server_image: ${_param:kubernetes_netchecker_server_image}
+ virtlet:
+ enabled: ${_param:kubernetes_virtlet_enabled}
+ namespace: kube-system
+ image: ${_param:kubernetes_virtlet_image}
+ hosts:
+ - ${_param:kubernetes_compute_node01_hostname}
+ - ${_param:kubernetes_compute_node02_hostname}
+ contrail_network_controller:
+ namespace: kube-system
+ enabled: true
+ image: ${_param:kubernetes_contrail_network_controller_image}
master:
etcd:
ssl:
@@ -35,26 +56,6 @@
namespace:
netchecker:
enabled: ${_param:kubernetes_netchecker_enabled}
- addons:
- dashboard:
- enabled: false
- helm:
- enabled: ${_param:kubernetes_helm_enabled}
- netchecker:
- enabled: ${_param:kubernetes_netchecker_enabled}
- agent_image: ${_param:kubernetes_netchecker_agent_image}
- server_image: ${_param:kubernetes_netchecker_server_image}
- virtlet:
- enabled: ${_param:kubernetes_virtlet_enabled}
- namespace: kube-system
- hosts:
- - ${_param:kubernetes_compute_node01_hostname}
- - ${_param:kubernetes_compute_node02_hostname}
- image: ${_param:kubernetes_virtlet_image}
- contrail_network_controller:
- namespace: kube-system
- enabled: true
- image: ${_param:kubernetes_contrail_network_controller_image}
network:
engine: opencontrail
public_ip_range: 185.22.97.128/26