aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/compass_conf/templates/ansible_installer/kubernetes/vars
diff options
context:
space:
mode:
authorhu xinhui <xinhui_hu@foxmail.com>2017-09-29 17:06:33 +0800
committerJustin chi <chigang@huawei.com>2017-10-16 01:47:13 +0000
commit1a1f792afdb66343645a3703f4fccb65ba3c11d1 (patch)
tree8a2750d18690174100ff24697d39b05e2545ba01 /deploy/compass_conf/templates/ansible_installer/kubernetes/vars
parentcb85c6c9a6a5eb1d492cddd44a6bcf876a3176a5 (diff)
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> (cherry picked from commit 179cd6db9f1bd9be1606187cf74e128bede7a8e6)
Diffstat (limited to 'deploy/compass_conf/templates/ansible_installer/kubernetes/vars')
-rw-r--r--deploy/compass_conf/templates/ansible_installer/kubernetes/vars/ansible-kubernetes.tmpl6
1 files changed, 3 insertions, 3 deletions
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'] }}"