openstack/deb-python-magnumclient
Code Issues Proposed changes

Merge "Remove support for keyapir UUID"

Browse Source
This commit is contained in:
Jenkins
2017-03-20 18:32:57 +00:00
committed by Gerrit Code Review
parent 72c202e5e0 69363f9632
commit 05be18a94f
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
magnumclient/v1/baymodels_shell.py
View File

@@ -38,7 +38,7 @@ def _show_baymodel(baymodel):
@utils.arg('--keypair-id', @utils.arg('--keypair-id',
required=True, required=True,
metavar='<keypair-id>', metavar='<keypair-id>',
help=_('The name or UUID of the SSH keypair to load into the' help=_('The name of the SSH keypair to load into the'
' Bay nodes.')) ' Bay nodes.'))
@utils.arg('--external-network-id', @utils.arg('--external-network-id',
required=True, required=True,

4
magnumclient/v1/cluster_templates_shell.py
View File

@@ -60,12 +60,12 @@ def _show_cluster_template(cluster_template):
dest='keypair', dest='keypair',
metavar='<keypair>', metavar='<keypair>',
help=utils.deprecation_message( help=utils.deprecation_message(
'The name or UUID of the SSH keypair to load into the ' 'The name of the SSH keypair to load into the '
'Cluster nodes.', 'keypair')) 'Cluster nodes.', 'keypair'))
@utils.arg('--keypair', @utils.arg('--keypair',
dest='keypair', dest='keypair',
metavar='<keypair>', metavar='<keypair>',
help=_('The name or UUID of the SSH keypair to load into the ' help=_('The name of the SSH keypair to load into the '
'Cluster nodes.')) 'Cluster nodes.'))
@utils.arg('--external-network-id', @utils.arg('--external-network-id',
dest='external_network', dest='external_network',

4
magnumclient/v1/clusters_shell.py
View File

@@ -101,13 +101,13 @@ def do_cluster_list(cs, args):
metavar='<keypair>', metavar='<keypair>',
default=None, default=None,
help=utils.deprecation_message( help=utils.deprecation_message(
'UUID or name of the keypair to use for this cluster.', 'Name of the keypair to use for this cluster.',
'keypair')) 'keypair'))
@utils.arg('--keypair', @utils.arg('--keypair',
dest='keypair', dest='keypair',
metavar='<keypair>', metavar='<keypair>',
default=None, default=None,
help=_('UUID or name of the keypair to use for this cluster.')) help=_('Name of the keypair to use for this cluster.'))
@utils.arg('--node-count', @utils.arg('--node-count',
metavar='<node-count>', metavar='<node-count>',
type=int, type=int,