Merge "launch-node.py : make sure new inventory comes last"

This commit is contained in:
Zuul 2020-02-20 22:37:59 +00:00 committed by Gerrit Code Review
commit a514f098ac

View File

@ -177,10 +177,10 @@ def bootstrap_server(server, key, name, volume_device, keep,
t.start() t.start()
inventory_list = ( inventory_list = (
jobdir.inventory_root,
'/opt/system-config/inventory/openstack.yaml', '/opt/system-config/inventory/openstack.yaml',
'/opt/system-config/inventory/groups.yaml', '/opt/system-config/inventory/groups.yaml',
'/etc/ansible/hosts/emergency.yaml', '/etc/ansible/hosts/emergency.yaml',
jobdir.inventory_root,
) )
inventory_cmds = [v for e in inventory_list for v in ('-i', e)] inventory_cmds = [v for e in inventory_list for v in ('-i', e)]
ansible_cmd = ['ansible-playbook', '--flush-cache' ] + \ ansible_cmd = ['ansible-playbook', '--flush-cache' ] + \