From 1ca8f1801578fa30befe2ff82456f426fe526030 Mon Sep 17 00:00:00 2001 From: ricolin Date: Mon, 20 Mar 2017 12:51:55 +0800 Subject: [PATCH] Remove support message for using keypair UUID 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 --- api-ref/source/parameters.yaml | 2 +- doc/source/userguide.rst | 4 ++-- magnum/api/controllers/v1/baymodel.py | 2 +- magnum/api/controllers/v1/cluster.py | 2 +- magnum/api/controllers/v1/cluster_template.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api-ref/source/parameters.yaml b/api-ref/source/parameters.yaml index fe6f8b7fbf..0d575063b8 100644 --- a/api-ref/source/parameters.yaml +++ b/api-ref/source/parameters.yaml @@ -333,7 +333,7 @@ insecure_registry: type: string keypair_id: 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 the bay/cluster. The login name is specific to the bay/cluster driver, for example with fedora-atomic image, default login name is ``fedora``. diff --git a/doc/source/userguide.rst b/doc/source/userguide.rst index 762ab518b1..03e075c52e 100644 --- a/doc/source/userguide.rst +++ b/doc/source/userguide.rst @@ -112,7 +112,7 @@ They are loosely grouped as: mandatory, infrastructure, COE specific. This is a mandatory parameter and there is no default value. --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 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 @@ -436,7 +436,7 @@ follows: been deleted. --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 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 diff --git a/magnum/api/controllers/v1/baymodel.py b/magnum/api/controllers/v1/baymodel.py index a6068a34ba..7d7e1a1d46 100644 --- a/magnum/api/controllers/v1/baymodel.py +++ b/magnum/api/controllers/v1/baymodel.py @@ -64,7 +64,7 @@ class BayModel(base.APIBase): keypair_id = wsme.wsattr(wtypes.StringType(min_length=1, max_length=255), 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) """The external network to attach to the Bay""" diff --git a/magnum/api/controllers/v1/cluster.py b/magnum/api/controllers/v1/cluster.py index d36954c4bd..e27db1eecf 100644 --- a/magnum/api/controllers/v1/cluster.py +++ b/magnum/api/controllers/v1/cluster.py @@ -100,7 +100,7 @@ class Cluster(base.APIBase): keypair = wsme.wsattr(wtypes.StringType(min_length=1, max_length=255), 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) """The node count for this cluster. Default to 1 if not set""" diff --git a/magnum/api/controllers/v1/cluster_template.py b/magnum/api/controllers/v1/cluster_template.py index 4a4d6b9aa8..58d896a96c 100644 --- a/magnum/api/controllers/v1/cluster_template.py +++ b/magnum/api/controllers/v1/cluster_template.py @@ -65,7 +65,7 @@ class ClusterTemplate(base.APIBase): keypair_id = wsme.wsattr(wtypes.StringType(min_length=1, max_length=255), 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) """The external network to attach to the Cluster"""