From 069835924120224ec46fc40877c89ac48608a6f5 Mon Sep 17 00:00:00 2001 From: Harry Huang Date: Thu, 20 Jul 2017 20:17:36 +0800 Subject: Dynamic Inventory JIRA: COMPASS-556 1. using dynamic ansible inventory 2. modify Class AnsibleInstaller in compass-tasks 3. modify compass conf to support this behavior 4. specify docker image in /deploy/conf/compass.conf 5. remove clusterhost status update in playbook_done.py Change-Id: I04079547c8b251571ae4e5b165d3bf425b8913b7 Signed-off-by: Harry Huang --- .../openstack_ocata/vars/HA-ansible-multinodes.tmpl | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars') diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl index 7b0f4ab0..b7b6b91e 100755 --- a/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl +++ b/deploy/compass_conf/templates/ansible_installer/openstack_ocata/vars/HA-ansible-multinodes.tmpl @@ -34,7 +34,6 @@ $res #set $host_info[$host['hostname']] = $info #set $inc = $inc + 1 #end for - host_info: $host_info #set ip_settings={} @@ -51,6 +50,7 @@ host_info: $host_info #set has = $getVar('ha', []) #set ha_vip = $getVar('ha_vip', []) +run_dir: $getVar('run_dir', '') enable_secgroup: $getVar('enable_secgroup', True) enable_fwaas: $getVar('enable_fwaas', True) @@ -187,13 +187,6 @@ CONGRESS_PASS: $congress_pass DEMO_PASS: $demo_pass ADMIN_PASS: $admin_pass -#set plugins = $getVar('plugins', []) -#for item in plugins -#set keys = $item.keys() -#set values = $item.values() -$keys[0]: $values[0] -#end for - #set neutron_service_plugins=['router'] #if $getVar('enable_fwaas', True) -- cgit 1.2.3-korg