Browse Source

Copy the inventory for standalone deploy in output_dir

In order to be re-used by post deployment action, this review
copy the ansible inventory into the output_dir as:
standalone-inventory.yaml.
If file exist it will replace the old one.

Change-Id: Ied14f40cf074755225abe1e8f1c859bacbe9022f
(cherry picked from commit 0736e447f9)
changes/25/786425/1
Mathieu Bultel 3 months ago
committed by mbu
parent
commit
b8661e9e6d
3 changed files with 10 additions and 3 deletions
  1. +3
    -2
      tripleoclient/constants.py
  2. +3
    -1
      tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py
  3. +4
    -0
      tripleoclient/v1/tripleo_deploy.py

+ 3
- 2
tripleoclient/constants.py View File

@ -101,9 +101,10 @@ VALIDATIONS_LOG_BASEDIR = '/var/log/validations'
DEFAULT_WORK_DIR = os.path.join(os.environ.get('HOME', '~/'),
'config-download')
ANSIBLE_INVENTORY = os.path.join(DEFAULT_WORK_DIR,
'{}/tripleo-ansible-inventory.yaml')
TRIPLEO_STATIC_INVENTORY = 'tripleo-ansible-inventory.yaml'
ANSIBLE_INVENTORY = os.path.join(DEFAULT_WORK_DIR,
'{}/', TRIPLEO_STATIC_INVENTORY)
ANSIBLE_VALIDATION_DIR = (
os.path.join(DEFAULT_VALIDATIONS_LEGACY_BASEDIR, 'playbooks')
if os.path.exists(os.path.join(DEFAULT_VALIDATIONS_LEGACY_BASEDIR,


+ 3
- 1
tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py View File

@ -816,7 +816,9 @@ class TestDeployUndercloud(TestPluginV1):
@mock.patch('tripleo_common.utils.config.Config',
autospec=True)
@mock.patch('os.path.join', return_value='/twd/inventory.yaml')
def test_download_ansible_playbooks(self, mock_join, mock_stack_config,
@mock.patch('shutil.copyfile')
def test_download_ansible_playbooks(self, mock_shutil, mock_join,
mock_stack_config,
mock_launch_heat, mock_importInv,
createdir_mock):


+ 4
- 0
tripleoclient/v1/tripleo_deploy.py View File

@ -858,6 +858,10 @@ class Deploy(command.Command):
}
inventory.write_static_inventory(inv_path, extra_vars)
# Move inventory in output_dir in order to be reusable by users:
shutil.copyfile(inv_path,
os.path.join(self.output_dir,
constants.TRIPLEO_STATIC_INVENTORY))
self.log.info(_('** Downloaded {0} ansible to {1} **').format(
stack_name, self.tmp_ansible_dir))


Loading…
Cancel
Save