openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "bnr - Set properly the default inventory file"

This commit is contained in:
Zuul 2022-03-18 11:00:56 +00:00 committed by Gerrit Code Review
parent 02108aa6e8 719a26aaf1
commit f449411e57
3 changed files with 19 additions and 5 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") LOG = logging.getLogger(__name__ + ".BackupOvercloud")
INVENTORY = constants.ANSIBLE_INVENTORY.format('overcloud')
class BackupOvercloud(command.Command): class BackupOvercloud(command.Command):
"""Backup the Overcloud""" """Backup the Overcloud"""
@ -91,10 +93,10 @@ class BackupOvercloud(command.Command):
parser.add_argument( parser.add_argument(
'--inventory', '--inventory',
default='/home/stack/tripleo-inventory.yaml', default=INVENTORY,
help=_("Tripleo inventory file generated with " help=_("Tripleo inventory file generated with "
"tripleo-ansible-inventory command. " "tripleo-ansible-inventory command. "
"Defaults to: /home/stack/tripleo-inventory.yaml.") "Defaults to: " + INVENTORY)
) )
parser.add_argument( parser.add_argument(

12
tripleoclient/v1/overcloud_restore.py
View File

@ -28,6 +28,8 @@ from tripleoclient import utils
LOG = logging.getLogger(__name__ + ".RestoreOvercloud") LOG = logging.getLogger(__name__ + ".RestoreOvercloud")
INVENTORY = constants.ANSIBLE_INVENTORY.format('overcloud')
class RestoreOvercloud(command.Command): class RestoreOvercloud(command.Command):
"""Restore the Overcloud""" """Restore the Overcloud"""
@ -39,6 +41,14 @@ class RestoreOvercloud(command.Command):
add_help=False 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( parser.add_argument(
'--stack', '--stack',
nargs='?', nargs='?',
@ -102,7 +112,7 @@ class RestoreOvercloud(command.Command):
self._run_ansible_playbook( self._run_ansible_playbook(
playbook='cli-overcloud-restore-node.yaml', playbook='cli-overcloud-restore-node.yaml',
inventory=constants.ANSIBLE_INVENTORY.format(parsed_args.stack), inventory=parsed_args.inventory,
tags=None, tags=None,
skip_tags=None, skip_tags=None,
extra_vars=extra_vars, 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") LOG = logging.getLogger(__name__ + ".BackupUndercloud")
INVENTORY = constants.ANSIBLE_INVENTORY.format('overcloud')
class BackupUndercloud(command.Command): class BackupUndercloud(command.Command):
"""Backup the undercloud""" """Backup the undercloud"""
@ -95,10 +97,10 @@ class BackupUndercloud(command.Command):
parser.add_argument( parser.add_argument(
'--inventory', '--inventory',
action='store', action='store',
default='/home/stack/tripleo-inventory.yaml', default=INVENTORY,
help=_("Tripleo inventory file generated with " help=_("Tripleo inventory file generated with "
"tripleo-ansible-inventory command. " "tripleo-ansible-inventory command. "
"Defaults to: /home/stack/tripleo-inventory.yaml.") "Defaults to: " + INVENTORY)
) )
# Parameter to choose the files to backup # Parameter to choose the files to backup