diff --git a/tripleoclient/v1/overcloud_backup.py b/tripleoclient/v1/overcloud_backup.py index 1c0513990..c2670213b 100644 --- a/tripleoclient/v1/overcloud_backup.py +++ b/tripleoclient/v1/overcloud_backup.py @@ -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( diff --git a/tripleoclient/v1/overcloud_restore.py b/tripleoclient/v1/overcloud_restore.py index f16702963..c5ca54f38 100644 --- a/tripleoclient/v1/overcloud_restore.py +++ b/tripleoclient/v1/overcloud_restore.py @@ -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,6 +41,14 @@ 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='?', @@ -102,7 +112,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, diff --git a/tripleoclient/v1/undercloud_backup.py b/tripleoclient/v1/undercloud_backup.py index 96e4514ab..abac6fc02 100644 --- a/tripleoclient/v1/undercloud_backup.py +++ b/tripleoclient/v1/undercloud_backup.py @@ -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