From 93ff4d51e0a6f5628adad7bd21e8e6044e1ff409 Mon Sep 17 00:00:00 2001 From: coldmoment Date: Fri, 5 May 2017 09:11:43 +0800 Subject: [PATCH] Add 'keypair' to 'list all clusters' response The response of operation 'list all clusters' has a member 'keypair', api-ref doc has no description about it. Add it to clusters.inc and cluster-get-all-resp.json. The same to operation 'Show details of a cluster'. Change-Id: I716175bfc9683a47514172bbc9b177f140fe924c Implements: Keypair override on cluster create --- api-ref/source/clusters.inc | 2 ++ api-ref/source/samples/cluster-get-all-resp.json | 3 ++- api-ref/source/samples/cluster-get-one-resp.json | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/api-ref/source/clusters.inc b/api-ref/source/clusters.inc index 05189df9dd..7a8260520f 100644 --- a/api-ref/source/clusters.inc +++ b/api-ref/source/clusters.inc @@ -94,6 +94,7 @@ Response - uuid: cluster_id - links: links - stack_id: stack_id + - keypair: keypair_id - master_count: master_count - cluster_template_id: clustertemplate_id - node_count: node_count @@ -149,6 +150,7 @@ Response - updated_at: updated_at - master_count: master_count - coe_version: coe_version + - keypair: keypair_id - cluster_template_id: clustertemplate_id - master_addresses: master_addresses - node_count: node_count diff --git a/api-ref/source/samples/cluster-get-all-resp.json b/api-ref/source/samples/cluster-get-all-resp.json index a48b76033f..5c181fa89d 100644 --- a/api-ref/source/samples/cluster-get-all-resp.json +++ b/api-ref/source/samples/cluster-get-all-resp.json @@ -15,10 +15,11 @@ } ], "stack_id":"31c1ee6c-081e-4f39-9f0f-f1d87a7defa1", + "keypair":"my_keypair", "master_count":1, "create_timeout":60, "node_count":1, "name":"k8s" } ] -} \ No newline at end of file +} diff --git a/api-ref/source/samples/cluster-get-one-resp.json b/api-ref/source/samples/cluster-get-one-resp.json index 69e3f7a57e..5cc7e7dc1f 100644 --- a/api-ref/source/samples/cluster-get-one-resp.json +++ b/api-ref/source/samples/cluster-get-one-resp.json @@ -18,6 +18,7 @@ "updated_at":"2016-08-29T06:53:24+00:00", "master_count":1, "coe_version": "v1.2.0", + "keypair":"my_keypair" "cluster_template_id":"0562d357-8641-4759-8fed-8173f02c9633", "master_addresses":[ "172.24.4.6" @@ -29,4 +30,4 @@ "status_reason":"Stack CREATE completed successfully", "create_timeout":60, "name":"k8s" -} \ No newline at end of file +}