commit c3c04661d6bc0ff9a8b372ee17e2c0047580b544
author Jakub Josef <jjosef@mirantis.com> Fri Oct 06 09:43:25 2017 +0000
committer Gerrit Code Review <gerrit2@6a1f56eca807> Fri Oct 06 09:43:25 2017 +0000
tree 2240bce5ee3cf02e41cd8bbaf1ecffa1cc27479e
parent cf0e1364afcf56d7be16925267d42776a0560f56
parent 8afdced0ef3cd62c25764a150c083776d3bf42f3

Merge "Fix nodes for virtlet addon in k8s_ha_calico."

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

diff --git a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
index be8ae98..2681e7f 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
@@ -33,7 +33,7 @@
           namespace: ${_param:kubernetes_addon_namespace}
           image: ${_param:kubernetes_virtlet_image}
           hosts:
-          - ${linux:system:name}
+          - ${_param:kubernetes_compute01_hostname}
       hyperkube:
         image: ${_param:kubernetes_hyperkube_image}
   linux:

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

diff --git a/classes/cluster/k8s-ha-calico/kubernetes/init.yml b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
index b2091b4..d8e5c25 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
@@ -44,6 +44,7 @@
     kubernetes_control_node01_hostname: ctl01
     kubernetes_control_node02_hostname: ctl02
     kubernetes_control_node03_hostname: ctl03
+    kubernetes_compute01_hostname: cmp0
     kubernetes_control_node01_address: 172.16.10.101
     kubernetes_control_node02_address: 172.16.10.102
     kubernetes_control_node03_address: 172.16.10.103