commit 22f1f031e791299584eb443b2a7a7a0a6b45e038
author Mateusz Matuszkowiak <mmatuszkowiak@mirantis.com> Mon Aug 20 13:32:15 2018 +0200
committer Mateusz Matuszkowiak <mmatuszkowiak@mirantis.com> Tue Aug 21 10:12:02 2018 +0200
tree 81f7680da8001de2fc210b87e4d08c03a1b3982e
parent f14b0f4d72f6c5aef486c3bec78b3433a7b04d03

Changed IPs for ctl nodes and computes

Change-Id: I03993b4402d5baa5091bff1239b3398c3234da04
Related-Bug: PROD-21872

classes/cluster/sl-k8s-calico/kubernetes/control.yml

diff --git a/classes/cluster/sl-k8s-calico/kubernetes/control.yml b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
index f070701..6519d88 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
@@ -16,8 +16,11 @@
     keepalived_k8s_apiserver_vip_interface: ${_param:primary_interface}
     keepalived_k8s_apiserver_vip_address: ${_param:kubernetes_control_address}
     keepalived_k8s_apiserver_vip_password: password
+    cluster_local_address: ${_param:deploy_address}
   etcd:
     server:
+      bind:
+        host: ${_param:deploy_address}
       source:
         engine: docker_hybrid
       ssl:
@@ -29,6 +32,9 @@
   kubernetes:
     common:
       addons:
+        dashboard:
+          enabled: ${_param:kubernetes_dashboard}
+          image: ${_param:kubernetes_dashboard_image}
         helm:
           enabled: ${_param:kubernetes_helm_enabled}
         calico_policy:
@@ -36,8 +42,14 @@
           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}
+          agent_probeurls: ${_param:kubernetes_netchecker_agent_probeurls}
+        dns:
+          enabled: ${_param:kubernetes_dns}
+          kubedns_image: ${_param:kubernetes_kubedns_image}
+          dnsmasq_image: ${_param:kubernetes_dnsmasq_image}
+          sidecar_image: ${_param:kubernetes_sidecar_image}
+          autoscaler:
+            image: ${_param:kubernetes_dns_autoscaler_image}
         coredns:
           enabled: ${_param:kubernetes_coredns_enabled}
         externaldns:
@@ -50,6 +62,7 @@
           - ${_param:kubernetes_metallb_addresses_pool}
     master:
       kubelet:
+        address: ${_param:single_address}
         fail_on_swap: ${_param:kubelet_fail_on_swap}
       etcd:
         ssl: