openstack/magnum
Code Issues Proposed changes

Remove support message for using keypair UUID

Browse Source 
UUID for keypair is no longer supported from heat and nova cli.
This patch suggest to remove the support message from magnum.
Closes-Bug: #1674211

Change-Id: Idb67fc86f067387060a381c9d2d0ed0f8c953c21
This commit is contained in:
ricolin 2017-03-20 12:51:55 +08:00
parent dd2a8520cb
commit 1ca8f18015
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api-ref/source/parameters.yaml
View File

@ -333,7 +333,7 @@ insecure_registry:
type: string type: string
keypair_id: keypair_id:
description: | description: |
The name or UUID of the SSH keypair to configure in the bay/cluster servers The name of the SSH keypair to configure in the bay/cluster servers
for ssh access. Users will need the key to be able to ssh to the servers in for ssh access. Users will need the key to be able to ssh to the servers in
the bay/cluster. The login name is specific to the bay/cluster driver, for the bay/cluster. The login name is specific to the bay/cluster driver, for
example with fedora-atomic image, default login name is ``fedora``. example with fedora-atomic image, default login name is ``fedora``.

4
doc/source/userguide.rst
View File

@ -112,7 +112,7 @@ They are loosely grouped as: mandatory, infrastructure, COE specific.
This is a mandatory parameter and there is no default value. This is a mandatory parameter and there is no default value.
--keypair \<keypair\> --keypair \<keypair\>
The name or UUID of the SSH keypair to configure in the cluster servers The name of the SSH keypair to configure in the cluster servers
for ssh access. You will need the key to be able to ssh to the for ssh access. You will need the key to be able to ssh to the
servers in the cluster. The login name is specific to the cluster servers in the cluster. The login name is specific to the cluster
driver. If keypair is not provided in template it will be required at driver. If keypair is not provided in template it will be required at
@ -436,7 +436,7 @@ follows:
been deleted. been deleted.
--keypair \<keypair\> --keypair \<keypair\>
The name or UUID of the SSH keypair to configure in the cluster servers The name of the SSH keypair to configure in the cluster servers
for ssh access. You will need the key to be able to ssh to the for ssh access. You will need the key to be able to ssh to the
servers in the cluster. The login name is specific to the cluster servers in the cluster. The login name is specific to the cluster
driver. If keypair is not provided it will attempt to use the value in driver. If keypair is not provided it will attempt to use the value in

2
magnum/api/controllers/v1/baymodel.py
View File

@ -64,7 +64,7 @@ class BayModel(base.APIBase):
keypair_id = wsme.wsattr(wtypes.StringType(min_length=1, max_length=255), keypair_id = wsme.wsattr(wtypes.StringType(min_length=1, max_length=255),
mandatory=True) mandatory=True)
"""The name or id of the nova ssh keypair""" """The name of the nova ssh keypair"""
external_network_id = wtypes.StringType(min_length=1, max_length=255) external_network_id = wtypes.StringType(min_length=1, max_length=255)
"""The external network to attach to the Bay""" """The external network to attach to the Bay"""

2
magnum/api/controllers/v1/cluster.py
View File

@ -100,7 +100,7 @@ class Cluster(base.APIBase):
keypair = wsme.wsattr(wtypes.StringType(min_length=1, max_length=255), keypair = wsme.wsattr(wtypes.StringType(min_length=1, max_length=255),
default=None) default=None)
"""The name or id of the nova ssh keypair""" """The name of the nova ssh keypair"""
node_count = wsme.wsattr(wtypes.IntegerType(minimum=1), default=1) node_count = wsme.wsattr(wtypes.IntegerType(minimum=1), default=1)
"""The node count for this cluster. Default to 1 if not set""" """The node count for this cluster. Default to 1 if not set"""

2
magnum/api/controllers/v1/cluster_template.py
View File

@ -65,7 +65,7 @@ class ClusterTemplate(base.APIBase):
keypair_id = wsme.wsattr(wtypes.StringType(min_length=1, max_length=255), keypair_id = wsme.wsattr(wtypes.StringType(min_length=1, max_length=255),
default=None) default=None)
"""The name or id of the nova ssh keypair""" """The name of the nova ssh keypair"""
external_network_id = wtypes.StringType(min_length=1, max_length=255) external_network_id = wtypes.StringType(min_length=1, max_length=255)
"""The external network to attach to the Cluster""" """The external network to attach to the Cluster"""