opendev/system-config
Code Issues Proposed changes

Finish switching to using new ansible inventory

Browse Source 
Change I76b1099bf0cf3bfead17f96e456cdce87d0e8a49 altered the name of
the inventory script, so reflect that in the corresponding
subprocess call in launch-node.py and a comment in the
expand-groups.sh script.

Change-Id: I4c2c762716813b5d59dcc1b623f5988c8aa7d490
This commit is contained in:
Jeremy Stanley 2018-06-18 18:27:34 +00:00
parent 2ee3403c69
commit 02e4eb0fa8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launch/launch-node.py
View File

@ -162,7 +162,7 @@ def bootstrap_server(server, key, name, volume_device, keep,
# Regenerate inventory cache, throwing an error if there is an issue
# so that we don't generate a bogus groups file
try:
run(['/etc/ansible/hosts/openstack', '--list'],
run(['/etc/ansible/hosts/openstack_inventory', '--list'],
env=expand_env)
except subprocess.CalledProcessError as e:
print "Inventory regeneration failed"

6
modules/openstack_project/files/puppetmaster/expand-groups.sh
View File

@ -26,9 +26,9 @@ unset OS_REGION_NAME
# Because we are generating "generated-groups", we need to work on an
# inventory without out it ... otherwise entries that have actually
# disappeared (according to /etc/ansible/hosts/openstack's live list)
# will keep coming back as "ansible --list" finds them in the
# generated-groups file. Later versions of ansible have a
# disappeared (according to /etc/ansible/hosts/openstack_inventory's
# live list) will keep coming back as "ansible --list" finds them in
# the generated-groups file. Later versions of ansible have a
# "inventory_ignore_patterns" that might help, we just copy & remove
# in a separate inventory
inv=${outdir}/hosts