openstack/python-tripleoclient
Code Issues Proposed changes

Fix upgrade playbook path.

Browse Source 
Ansible is now generated into overcloud-deploy while
constants.MAJOR_UPGRADE_PLAYBOOKS is no longer static path within the
ansible execution dir.

Co-authored-by: Daniel Bengtsson <dbengt@redhat.com>

Change-Id: I2c7fd4304701f128ec0588c5a2bf4a3c7da842ad
(cherry picked from commit fe6a5a30ff)
(cherry picked from commit 4cf89d8171)
This commit is contained in:
Lukas Bezdicka 2022-08-02 15:17:36 +02:00 committed by Daniel Bengtsson
parent 6baa1b6bca
commit bb01bcdbdc
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tripleoclient/v1/overcloud_upgrade.py
View File

@ -208,19 +208,20 @@ class UpgradeRun(command.Command):
constants.UPGRADE_PROMPT, self.log)): constants.UPGRADE_PROMPT, self.log)):
raise OvercloudUpgradeNotConfirmed(constants.UPGRADE_NO) raise OvercloudUpgradeNotConfirmed(constants.UPGRADE_NO)
# NOTE(cloudnull): The string option "all" was a special default
# that is no longer relevant. To retain compatibility
# this condition has been put in place.
if not parsed_args.playbook or parsed_args.playbook == ['all']:
playbook = constants.MAJOR_UPGRADE_PLAYBOOKS
else:
playbook = parsed_args.playbook
working_dir = oooutils.get_default_working_dir(parsed_args.stack) working_dir = oooutils.get_default_working_dir(parsed_args.stack)
config_download_dir = os.path.join(working_dir, 'config-download') config_download_dir = os.path.join(working_dir, 'config-download')
ansible_dir = os.path.join(config_download_dir, parsed_args.stack) ansible_dir = os.path.join(config_download_dir, parsed_args.stack)
inventory_path = os.path.join(ansible_dir, inventory_path = os.path.join(ansible_dir,
'tripleo-ansible-inventory.yaml') 'tripleo-ansible-inventory.yaml')
# NOTE(cloudnull): The string option "all" was a special default
# that is no longer relevant. To retain compatibility
# this condition has been put in place.
if not parsed_args.playbook or parsed_args.playbook == ['all']:
playbook = [os.path.join(ansible_dir, p)
for p in constants.MAJOR_UPGRADE_PLAYBOOKS]
else:
playbook = parsed_args.playbook
key = oooutils.get_key(parsed_args.stack) key = oooutils.get_key(parsed_args.stack)
oooutils.run_ansible_playbook( oooutils.run_ansible_playbook(
playbook=playbook, playbook=playbook,