Merge "Remove --no-workflow option"
This commit is contained in:
commit
cd8a278cdb
@ -0,0 +1,8 @@
|
||||
---
|
||||
upgrades:
|
||||
- |
|
||||
The ``--no-workflow`` option has been removed from the following command.
|
||||
|
||||
- ``openstack overcloud external update run``
|
||||
- ``openstack overcloud external upgrade run``
|
||||
- ``openstack overcloud update run``
|
@ -39,12 +39,9 @@ class Command(command.Command):
|
||||
raise
|
||||
|
||||
@staticmethod
|
||||
def get_ansible_key_and_dir(no_workflow, stack, orchestration):
|
||||
def get_ansible_key_and_dir(stack, orchestration):
|
||||
"""Return the ansible directory and key path.
|
||||
|
||||
:param no_workflow: Enable or disable the mistral workflow code path.
|
||||
:type no_workflow: Boolean
|
||||
|
||||
:oaram stack: Name of a given stack to run against.
|
||||
:type stack: String
|
||||
|
||||
@ -53,22 +50,15 @@ class Command(command.Command):
|
||||
|
||||
:returns: Tuple
|
||||
"""
|
||||
|
||||
if no_workflow:
|
||||
key = utils.get_key(stack=stack)
|
||||
stack_config = config.Config(orchestration)
|
||||
with utils.TempDirs(chdir=False) as tmp:
|
||||
stack_config.write_config(
|
||||
stack_config.fetch_config(stack),
|
||||
stack,
|
||||
tmp
|
||||
)
|
||||
return key, tmp
|
||||
else:
|
||||
# Assumes execution will take place from within a mistral
|
||||
# container.
|
||||
key = '.ssh/tripleo-admin-rsa'
|
||||
return key, None
|
||||
key = utils.get_key(stack=stack)
|
||||
stack_config = config.Config(orchestration)
|
||||
with utils.TempDirs(chdir=False) as tmp:
|
||||
stack_config.write_config(
|
||||
stack_config.fetch_config(stack),
|
||||
stack,
|
||||
tmp
|
||||
)
|
||||
return key, tmp
|
||||
|
||||
def get_key_pair(self, parsed_args):
|
||||
"""Autodetect or return a user defined key file.
|
||||
|
@ -88,11 +88,6 @@ class ExternalUpdateRun(command.Command):
|
||||
help=('Set additional variables as key=value or '
|
||||
'yaml/json'),
|
||||
default=[])
|
||||
parser.add_argument('--no-workflow', dest='no_workflow',
|
||||
action='store_true',
|
||||
default=True,
|
||||
help=_('This option no longer has any effect.')
|
||||
)
|
||||
parser.add_argument('-y', '--yes', default=False,
|
||||
action='store_true',
|
||||
help=_("Use -y or --yes to skip the confirmation "
|
||||
@ -137,7 +132,6 @@ class ExternalUpdateRun(command.Command):
|
||||
|
||||
if parsed_args.refresh:
|
||||
_, ansible_dir = self.get_ansible_key_and_dir(
|
||||
no_workflow=True,
|
||||
stack=parsed_args.stack,
|
||||
orchestration=self.app.client_manager.orchestration
|
||||
)
|
||||
|
@ -85,11 +85,6 @@ class ExternalUpgradeRun(command.Command):
|
||||
help=('Set additional variables as key=value or '
|
||||
'yaml/json'),
|
||||
default=[])
|
||||
parser.add_argument('--no-workflow', dest='no_workflow',
|
||||
action='store_true',
|
||||
default=True,
|
||||
help=_('This option no longer has any effect.')
|
||||
)
|
||||
parser.add_argument('-y', '--yes', default=False,
|
||||
action='store_true',
|
||||
help=_("Use -y or --yes to skip the confirmation "
|
||||
@ -129,7 +124,6 @@ class ExternalUpgradeRun(command.Command):
|
||||
raise OvercloudUpgradeNotConfirmed(constants.UPGRADE_NO)
|
||||
|
||||
_, ansible_dir = self.get_ansible_key_and_dir(
|
||||
no_workflow=True,
|
||||
stack=parsed_args.stack,
|
||||
orchestration=self.app.client_manager.orchestration
|
||||
)
|
||||
|
@ -130,11 +130,6 @@ class UpdateRun(command.Command):
|
||||
default=utils.env('OVERCLOUD_STACK_NAME',
|
||||
default='overcloud')
|
||||
)
|
||||
parser.add_argument('--no-workflow', dest='no_workflow',
|
||||
action='store_true',
|
||||
default=True,
|
||||
help=_('This option no longer has any effect.')
|
||||
)
|
||||
parser.add_argument(
|
||||
'--tags',
|
||||
action='store',
|
||||
|
@ -187,11 +187,6 @@ class UpgradeRun(command.Command):
|
||||
default=utils.env('OVERCLOUD_STACK_NAME',
|
||||
default='overcloud')
|
||||
)
|
||||
parser.add_argument('--no-workflow', dest='no_workflow',
|
||||
action='store_true',
|
||||
default=True,
|
||||
help=_('This option no longer has any effect.')
|
||||
)
|
||||
parser.add_argument('-y', '--yes', default=False,
|
||||
action='store_true',
|
||||
help=_("Use -y or --yes to skip the confirmation "
|
||||
@ -228,7 +223,6 @@ class UpgradeRun(command.Command):
|
||||
playbook = parsed_args.playbook
|
||||
|
||||
_, ansible_dir = self.get_ansible_key_and_dir(
|
||||
no_workflow=parsed_args.no_workflow,
|
||||
stack=parsed_args.stack,
|
||||
orchestration=self.app.client_manager.orchestration
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user