From 429055ef400a62f7e470d21c0053211fed536979 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Fri, 25 Jun 2021 14:56:58 -0600 Subject: [PATCH] Use same config download method as overcloud for tripleo deploy We currently re-implement what the download_config function does in tripleo-common. Let's just reuse that function to align better with what the overcloud does. Depends-On: https://review.opendev.org/c/openstack/tripleo-common/+/798153 Change-Id: Idc66d711ca7f4ce6369e38526257b887b9bc7dfd --- tripleoclient/v1/tripleo_deploy.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tripleoclient/v1/tripleo_deploy.py b/tripleoclient/v1/tripleo_deploy.py index b5c88d389..85aec2b21 100644 --- a/tripleoclient/v1/tripleo_deploy.py +++ b/tripleoclient/v1/tripleo_deploy.py @@ -801,9 +801,7 @@ class Deploy(command.Command): stack_name)) # python output buffering is making this seem to take forever.. sys.stdout.flush() - stack_config.write_config(stack_config.fetch_config(stack_name), - stack_name, - self.tmp_ansible_dir) + stack_config.download_config(stack_name, self.tmp_ansible_dir) inventory = TripleoInventory( hclient=client, @@ -823,6 +821,9 @@ class Deploy(command.Command): shutil.copyfile(inv_path, os.path.join(self.output_dir, constants.TRIPLEO_STATIC_INVENTORY)) + # copy inventory file to Runner friendly path + shutil.copyfile(inv_path, os.path.join(self.tmp_ansible_dir, + 'inventory', 'tripleo')) self.log.info(_('** Downloaded {0} ansible to {1} **').format( stack_name, self.tmp_ansible_dir))