Merge "Switch inventory to directory"

This commit is contained in:
Zuul
2021-07-01 02:42:59 +00:00
committed by Gerrit Code Review
2 changed files with 2 additions and 2 deletions

View File

@@ -1316,7 +1316,7 @@ class Deploy(command.Command):
utils.run_ansible_playbook(
inventory=os.path.join(
self.ansible_dir,
'inventory.yaml'
'inventory'
),
workdir=self.ansible_dir,
verbosity=utils.playbook_verbosity(self=self),

View File

@@ -416,7 +416,7 @@ def config_download(log, clients, stack, ssh_network='ctlplane',
stack_work_dir = os.path.join(output_dir, stack.stack_name)
if not inventory_path:
inventory_path = os.path.join(stack_work_dir,
'tripleo-ansible-inventory.yaml')
'inventory')
if isinstance(ansible_playbook_name, list):
playbooks = [os.path.join(stack_work_dir, p)