Switch inventory to directory
Rather than use the generated ansisble inventory.yaml or tripleo-ansible-inventory.yaml, switch to use the native AnsibleRunner inventory directory instead. Change-Id: I74b31d1080fd7b19efbe706024267aa871a6029b
This commit is contained in:
parent
429055ef40
commit
92d11b96b4
@ -1316,7 +1316,7 @@ class Deploy(command.Command):
|
|||||||
utils.run_ansible_playbook(
|
utils.run_ansible_playbook(
|
||||||
inventory=os.path.join(
|
inventory=os.path.join(
|
||||||
self.ansible_dir,
|
self.ansible_dir,
|
||||||
'inventory.yaml'
|
'inventory'
|
||||||
),
|
),
|
||||||
workdir=self.ansible_dir,
|
workdir=self.ansible_dir,
|
||||||
verbosity=utils.playbook_verbosity(self=self),
|
verbosity=utils.playbook_verbosity(self=self),
|
||||||
|
@ -416,7 +416,7 @@ def config_download(log, clients, stack, ssh_network='ctlplane',
|
|||||||
stack_work_dir = os.path.join(output_dir, stack.stack_name)
|
stack_work_dir = os.path.join(output_dir, stack.stack_name)
|
||||||
if not inventory_path:
|
if not inventory_path:
|
||||||
inventory_path = os.path.join(stack_work_dir,
|
inventory_path = os.path.join(stack_work_dir,
|
||||||
'tripleo-ansible-inventory.yaml')
|
'inventory')
|
||||||
|
|
||||||
if isinstance(ansible_playbook_name, list):
|
if isinstance(ansible_playbook_name, list):
|
||||||
playbooks = [os.path.join(stack_work_dir, p)
|
playbooks = [os.path.join(stack_work_dir, p)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user