commit 61bffdc40837eea4ebe60997c7aab10eefdda577
author vrovachev <vrovachev@mirantis.com> Mon Aug 14 20:23:27 2017 +0400
committer Vadim Rovachev <vrovachev@mirantis.com> Thu Aug 24 16:34:02 2017 +0000
tree 0c0755010dd9f16a734d56f6cd0e2e1959a653f0
parent 50a01c9855dafae6b98bd89f61ac66e7e9cc2820

Fix for patch with etcd in k8s_ha_contrail.

* Added missing params for etcd in k8s_ha_contrail
model.

Change-Id: Ib08440762cff7ff12a5b284ba194c6f9601f7c93

classes/cluster/k8s_ha_contrail/kubernetes/control.yml

diff --git a/classes/cluster/k8s_ha_contrail/kubernetes/control.yml b/classes/cluster/k8s_ha_contrail/kubernetes/control.yml
index 7be0d64..7befd55 100644
--- a/classes/cluster/k8s_ha_contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s_ha_contrail/kubernetes/control.yml
@@ -12,6 +12,8 @@
     keepalived_vip_virtual_router_id: 60
   etcd:
     server:
+      bind:
+        host: ${_param:deploy_address}
       source:
         engine: docker_hybrid
       ssl:

classes/cluster/k8s_ha_contrail/kubernetes/init.yml

diff --git a/classes/cluster/k8s_ha_contrail/kubernetes/init.yml b/classes/cluster/k8s_ha_contrail/kubernetes/init.yml
index 86abeef..363e068 100644
--- a/classes/cluster/k8s_ha_contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s_ha_contrail/kubernetes/init.yml
@@ -34,15 +34,17 @@
     kubernetes_control_node01_address: 172.16.10.101
     kubernetes_control_node02_address: 172.16.10.102
     kubernetes_control_node03_address: 172.16.10.103
+    kubernetes_control_node01_deploy_address: 192.168.10.101
+    kubernetes_control_node02_deploy_address: 192.168.10.102
+    kubernetes_control_node03_deploy_address: 192.168.10.103
+    etcd_control_node01_address: 192.168.10.101
+    etcd_control_node02_address: 192.168.10.102
+    etcd_control_node03_address: 192.168.10.103
     kubernetes_proxy_node01_hostname: prx01
     kubernetes_proxy_node01_address: 172.16.10.121
-    etcd_control_node01_address: ${_param:kubernetes_control_node01_address}
-    etcd_control_node02_address: ${_param:kubernetes_control_node02_address}
-    etcd_control_node03_address: ${_param:kubernetes_control_node03_address}
-
 
     cluster_vip_address: ${_param:kubernetes_control_address}
-    cluster_local_address: ${_param:single_address}
+    cluster_local_address: ${_param:deploy_address}
 
     # etcd stuff
     cluster_node01_hostname: ${_param:kubernetes_control_node01_hostname}