From 92d11b96b4beeb35dc1bc2abc645f77431454e18 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 28 Jun 2021 10:34:20 -0600 Subject: [PATCH] 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 --- tripleoclient/v1/tripleo_deploy.py | 2 +- tripleoclient/workflows/deployment.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tripleoclient/v1/tripleo_deploy.py b/tripleoclient/v1/tripleo_deploy.py index 85aec2b21..035de536b 100644 --- a/tripleoclient/v1/tripleo_deploy.py +++ b/tripleoclient/v1/tripleo_deploy.py @@ -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), diff --git a/tripleoclient/workflows/deployment.py b/tripleoclient/workflows/deployment.py index f6cab6d39..d98e1a8fa 100644 --- a/tripleoclient/workflows/deployment.py +++ b/tripleoclient/workflows/deployment.py @@ -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)