Modification for kargo to generate dynamic inventory

JIRA: -

There is some hardcode for kargo inventory.This patch is to  generate dynamic inventory for kargo

Change-Id: If4a7c5f973e520e4ca24c3c9e0bfa97725a5a44c
Signed-off-by: hu xinhui <xinhui_hu@foxmail.com>

2 files changed, 13 insertions, 13 deletions

diff --git a/deploy/compass_conf/templates/ansible_installer/kubernetes/hosts/ansible-kubernetes.tmpl b/deploy/compass_conf/templates/ansible_installer/kubernetes/hosts/ansible-kubernetes.tmpl
index 9d628b5e..0a9e3025 100644
--- a/deploy/compass_conf/templates/ansible_installer/kubernetes/hosts/ansible-kubernetes.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/kubernetes/hosts/ansible-kubernetes.tmpl
@@ -9,22 +9,22 @@
 
 # localhost
 127.0.0.1 localhost
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#if not $isinstance($controllers, list)
-    #set controllers = [$controllers]
+#set kube_masters = $getVar('kube_master', [])
+#set kube_nodes = $getVar('kube_node', [])
+#if not $isinstance($kube_masters, list)
+    #set kube_masters = [$kube_masters]
 #end if
-#if not $isinstance($compute, list)
-    #set computes = [$computes]
+#if not $isinstance($kube_nodes, list)
+    #set kube_nodes = [$kube_nodes]
 #end if
-# controller
-#for worker in $controllers
+# kube_master
+#for worker in $kube_masters
     #set worker_hostname = $worker.hostname
     #set worker_ip = $ip_settings[$worker_hostname].mgmt.ip
 $worker_ip $worker_hostname
 #end for
-# compute
-#for worker in $computes
+# kube_node
+#for worker in $kube_nodes
     #set worker_hostname = $worker.hostname
     #set worker_ip = $ip_settings[$worker_hostname].mgmt.ip
 $worker_ip $worker_hostname
diff --git a/deploy/compass_conf/templates/ansible_installer/kubernetes/vars/ansible-kubernetes.tmpl b/deploy/compass_conf/templates/ansible_installer/kubernetes/vars/ansible-kubernetes.tmpl
index 27211e06..440bf7d7 100644
--- a/deploy/compass_conf/templates/ansible_installer/kubernetes/vars/ansible-kubernetes.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/kubernetes/vars/ansible-kubernetes.tmpl
@@ -20,8 +20,8 @@
 #set has = $getVar('ha', [])
 #set ha_vip = $getVar('ha_vip', [])
 
-#set controllers = $getVar('controller', [])
-#set computers = $getVar('compute', [])
+#set kube_masters = $getVar('kube_master', [])
+#set kube_nodes = $getVar('kube_node', [])
 
 enable_secgroup: $getVar('enable_secgroup', True)
 enable_fwaas: $getVar('enable_fwaas', True)
@@ -35,7 +35,7 @@ network_cfg: $network_cfg
 sys_intf_mappings: $sys_intf_mappings
 deploy_type: $getVar('deploy_type', 'virtual')
 
-public_cidr: $computers[0]['install']['subnet']
+public_cidr: $kube_nodes[0]['install']['subnet']
 storage_cidr: "{{ ip_settings[inventory_hostname]['storage']['cidr'] }}"
 mgmt_cidr: "{{ ip_settings[inventory_hostname]['mgmt']['cidr'] }}"