Merge "Remove support for keyapir UUID"

This commit is contained in:
Jenkins 2017-03-20 18:32:57 +00:00 committed by Gerrit Code Review
commit 05be18a94f
3 changed files with 5 additions and 5 deletions

View File

@ -38,7 +38,7 @@ def _show_baymodel(baymodel):
@utils.arg('--keypair-id',
required=True,
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.'))
@utils.arg('--external-network-id',
required=True,

View File

@ -60,12 +60,12 @@ def _show_cluster_template(cluster_template):
dest='keypair',
metavar='<keypair>',
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'))
@utils.arg('--keypair',
dest='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.'))
@utils.arg('--external-network-id',
dest='external_network',

View File

@ -101,13 +101,13 @@ def do_cluster_list(cs, args):
metavar='<keypair>',
default=None,
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'))
@utils.arg('--keypair',
dest='keypair',
metavar='<keypair>',
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',
metavar='<node-count>',
type=int,