openstack
/
python-tripleoclient
Code Issues Proposed changes

Only show deprecated args for overcloud deploy 

The --*-flavor and --*-scale CLI args were deprecated for the "openstack
overcloud deploy" command. This had the unintentional side effect of making
them as deprecated in the "openstack overcloud profiles match" command despite
there being no alternative method.

This change amends that so that the deprecation warnings are only shown for the
"deploy" command.

Change-Id: Iaf60e1e9c99f50d6e63b7da1712a728cd89559a4
Closes-bug: #1629907
This commit is contained in:
Ana Krivokapic 2016-11-01 14:35:10 +01:00
parent 5f4b69b24f
commit d7309d5317
2 changed files with 36 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
tripleoclient/utils.py
View File

@ -699,63 +699,54 @@ def assign_and_verify_profiles(bm_client, flavors,
return predeploy_errors, predeploy_warnings
def add_deployment_plan_arguments(parser):
def add_deployment_plan_arguments(parser, mark_as_depr=False):
"""Add deployment plan arguments (flavors and scales) to a parser"""
depr_warning = _(' (DEPRECATED. Use an environment file and set the '
'parameter %s. It will be removed after the "P" '
'release.)')
# TODO(d0ugal): Deprecated in Newton. Remove these in P.
parser.add_argument('--control-scale', type=int,
help=_('New number of control nodes. (DEPRECATED. Use '
'an environment file and set the parameter '
'ControllerCount. It will be removed after the '
'"P" release.)'))
help=_('New number of control nodes.')
+ (depr_warning % 'ControllerCount'
if mark_as_depr else ''))
parser.add_argument('--compute-scale', type=int,
help=_('New number of compute nodes. (DEPRECATED. Use '
'an environment file and set the parameter '
'ComputeCount. It will be removed after the '
'"P" release.)'))
help=_('New number of compute nodes.')
+ (depr_warning % 'ComputeCount'
if mark_as_depr else ''))
parser.add_argument('--ceph-storage-scale', type=int,
help=_('New number of ceph storage nodes. '
'(DEPRECATED. Use an environment file and set '
'the parameter CephStorageCount. It will be '
'removed after the "P" release.)'))
help=_('New number of ceph storage nodes.')
+ (depr_warning % 'CephStorageCount'
if mark_as_depr else ''))
parser.add_argument('--block-storage-scale', type=int,
help=_('New number of cinder storage nodes. '
'(DEPRECATED. Use an environment file and set '
'the parameter BlockStorageCount. It will be '
'removed after the "P" release.)'))
help=_('New number of cinder storage nodes.')
+ (depr_warning % 'BlockStorageCount'
if mark_as_depr else ''))
parser.add_argument('--swift-storage-scale', type=int,
help=_('New number of swift storage nodes. '
'(DEPRECATED. Use an environment file and set '
'the parameter ObjectStorageCount. It will be '
'removed after the "P" release.)'))
help=_('New number of swift storage nodes.')
+ (depr_warning % 'ObjectStorageCount'
if mark_as_depr else ''))
parser.add_argument('--control-flavor',
help=_('Nova flavor to use for control nodes. '
'(DEPRECATED. Use an environment file and set '
'the parameter OvercloudControlFlavor. It will '
'be removed after the "P" release.)'))
help=_('Nova flavor to use for control nodes.')
+ (depr_warning % 'OvercloudControlFlavor'
if mark_as_depr else ''))
parser.add_argument('--compute-flavor',
help=_('Nova flavor to use for compute nodes. '
'(DEPRECATED. Use an environment file and set '
'the parameter OvercloudComputeFlavor. It will '
'be removed after the "P" release.)'))
help=_('Nova flavor to use for compute nodes.')
+ (depr_warning % 'OvercloudComputeFlavor'
if mark_as_depr else ''))
parser.add_argument('--ceph-storage-flavor',
help=_('Nova flavor to use for ceph storage '
'nodes. (DEPRECATED. Use '
'an environment file and set the parameter '
'OvercloudCephStorageFlavor. It will '
'be removed after the "P" release.)'))
help=_('Nova flavor to use for ceph storage nodes.')
+ (depr_warning % 'OvercloudCephStorageFlavor'
if mark_as_depr else ''))
parser.add_argument('--block-storage-flavor',
help=_('Nova flavor to use for cinder storage '
'nodes. (DEPRECATED. Use '
'an environment file and set the parameter '
'OvercloudBlockStorageFlavor. It will '
'be removed after the "P" release.)'))
help=_('Nova flavor to use for cinder storage nodes')
+ (depr_warning % 'OvercloudBlockStorageFlavor'
if mark_as_depr else ''))
parser.add_argument('--swift-storage-flavor',
help=_('Nova flavor to use for swift storage '
'nodes. (DEPRECATED. Use '
'an environment file and set the parameter '
'OvercloudSwiftStorageFlavor. It will '
'be removed after the "P" release.)'))
help=_('Nova flavor to use for swift storage nodes')
+ (depr_warning % 'OvercloudSwiftStorageFlavor'
if mark_as_depr else ''))
def get_roles_info(parsed_args):

2
tripleoclient/v1/overcloud_deploy.py
View File

@ -900,7 +900,7 @@ class DeployOvercloud(command.Command):
parser.add_argument('--timeout', '-t', metavar='<TIMEOUT>',
type=int, default=240,
help=_('Deployment timeout in minutes.'))
utils.add_deployment_plan_arguments(parser)
utils.add_deployment_plan_arguments(parser, mark_as_depr=True)
parser.add_argument('--libvirt-type',
choices=['kvm', 'qemu'],
help=_('Libvirt domain type.'))