openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "bnr - Set properly the default inventory file" into stable/wallaby

This commit is contained in:
Zuul 2022-06-15 17:20:14 +00:00 committed by Gerrit Code Review
parent c3f8681f2c 33bb74cae9
commit 3cb4bdac8f
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tripleoclient/v1/overcloud_backup.py
View File

@ -26,6 +26,8 @@ from tripleoclient import utils
LOG = logging.getLogger(__name__ + ".BackupOvercloud")
INVENTORY = constants.ANSIBLE_INVENTORY.format('overcloud')
class BackupOvercloud(command.Command):
"""Backup the Overcloud"""
@ -91,10 +93,10 @@ class BackupOvercloud(command.Command):
parser.add_argument(
'--inventory',
default='/home/stack/tripleo-inventory.yaml',
default=INVENTORY,
help=_("Tripleo inventory file generated with "
"tripleo-ansible-inventory command. "
"Defaults to: /home/stack/tripleo-inventory.yaml.")
"Defaults to: " + INVENTORY)
)
parser.add_argument(

15
tripleoclient/v1/overcloud_restore.py
View File

@ -28,6 +28,8 @@ from tripleoclient import utils
LOG = logging.getLogger(__name__ + ".RestoreOvercloud")
INVENTORY = constants.ANSIBLE_INVENTORY.format('overcloud')
class RestoreOvercloud(command.Command):
"""Restore the Overcloud"""
@ -39,12 +41,21 @@ class RestoreOvercloud(command.Command):
add_help=False
)
parser.add_argument(
'--inventory',
default=INVENTORY,
help=_("Tripleo inventory file generated with "
"tripleo-ansible-inventory command. "
"Defaults to: " + INVENTORY)
)
parser.add_argument(
'--stack',
nargs='?',
help=_('Name or ID of the stack to be used'
'(default=Env: OVERCLOUD_STACK_NAME)'),
default=osc_utils.env('OVERCLOUD_STACK_NAME'))
default=osc_utils.env('OVERCLOUD_STACK_NAME')
)
parser.add_argument(
'--node-name',
@ -102,7 +113,7 @@ class RestoreOvercloud(command.Command):
self._run_ansible_playbook(
playbook='cli-overcloud-restore-node.yaml',
inventory=constants.ANSIBLE_INVENTORY.format(parsed_args.stack),
inventory=parsed_args.inventory,
tags=None,
skip_tags=None,
extra_vars=extra_vars,

6
tripleoclient/v1/undercloud_backup.py
View File

@ -26,6 +26,8 @@ from tripleoclient import utils
LOG = logging.getLogger(__name__ + ".BackupUndercloud")
INVENTORY = constants.ANSIBLE_INVENTORY.format('overcloud')
class BackupUndercloud(command.Command):
"""Backup the undercloud"""
@ -95,10 +97,10 @@ class BackupUndercloud(command.Command):
parser.add_argument(
'--inventory',
action='store',
default='/home/stack/tripleo-inventory.yaml',
default=INVENTORY,
help=_("Tripleo inventory file generated with "
"tripleo-ansible-inventory command. "
"Defaults to: /home/stack/tripleo-inventory.yaml.")
"Defaults to: " + INVENTORY)
)
# Parameter to choose the files to backup