commit 3059385b48fac7ef83b2156e8bfe1e52296d3bdd
author vrovachev <vrovachev@mirantis.com> Mon Sep 18 17:32:53 2017 +0400
committer Jakub Josef <jjosef@mirantis.com> Tue Sep 26 15:33:13 2017 +0000
tree e54b3a2cb8254ff581f0d31bf99e22da8be7c5ce
parent 4d36637a8026a9946e8f747b0912392742281889

Refactor parameters for k8s-ha-calico model.

* Moved k8s parameters to init file.
* Moved virtlet addon to compute k8s nodes.
* Moved k8s router from ens4 to ens3

Change-Id: I325dcabad7a4b9c062ca2765d9d9643052ca0327

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

diff --git a/classes/cluster/k8s-ha-calico/kubernetes/control.yml b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
index e45aea5..855b338 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
@@ -26,6 +26,8 @@
       #      logLevel: INFO
   etcd:
     server:
+      bind:
+        host: ${_param:deploy_address}
       source:
         engine: docker_hybrid
       ssl:
@@ -37,11 +39,21 @@
   kubernetes:
     common:
       addons:
-        netchecker:
-          enabled: true
+        dashboard:
+          enabled: ${_param:kubernetes_dashboard}
         helm:
-          enabled: false
+          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}
+          agent_probeurls: ${_param:kubernetes_netchecker_agent_probeurls}
     master:
+      kubelet:
+        address: ${_param:single_address}
       etcd:
         ssl:
           enabled: true