commit ce63afbfe2c669984cd6b3373d9f86b6c8f0ff62
author Sergii Golovatiuk <sgolovatiuk@mirantis.com> Thu Aug 10 17:39:19 2017 +0200
committer Sergii Golovatiuk <sgolovatiuk@mirantis.com> Thu Aug 10 17:46:06 2017 +0200
tree 21f8f4d91189ed8ae417739a4fe57f0f1c7c2b83
parent 0b72c6223e11caebf1d0bc3767474839c8279ca2

Move addons to common section

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

classes/cluster/sl_k8s_contrail/kubernetes/control.yml

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