aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-05 10:46:14 +0000
committerGerrit Code Review <review@openstack.org>2016-08-05 10:46:14 +0000
commitdfcfb9d4de5ecc4b624ea4497718cb98e80b2d7e (patch)
tree356705e85db8f56f9c9ea5e435a35ac65231284d /overcloud.yaml
parenta45ea6107df25f1444142a1945717c90180e2700 (diff)
parentfecd61e9a4a08777b2609e0c6938193dc149d350 (diff)
Merge "Remove KeyName parameter from overcloud template"
Diffstat (limited to 'overcloud.yaml')
-rw-r--r--overcloud.yaml10
1 files changed, 0 insertions, 10 deletions
diff --git a/overcloud.yaml b/overcloud.yaml
index 2db7d33d..df3101c2 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -46,12 +46,6 @@ parameters:
Control the IP allocation for the InternalApiVirtualInterface port. E.g.
[{'ip_address':'1.2.3.4'}]
type: json
- KeyName:
- default: default
- description: Name of an existing Nova key pair to enable SSH access to the instances
- type: string
- constraints:
- - custom_constraint: nova.keypair
NeutronControlPlaneID:
default: 'ctlplane'
type: string
@@ -603,7 +597,6 @@ resources:
GlanceHost: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]}
Image: {get_param: NovaImage}
ImageUpdatePolicy: {get_param: ImageUpdatePolicy}
- KeyName: {get_param: KeyName}
KeystoneAdminApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}
KeystonePublicApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]}
NeutronPassword: {get_param: NeutronPassword}
@@ -656,7 +649,6 @@ resources:
type: OS::TripleO::BlockStorage
properties:
Image: {get_param: BlockStorageImage}
- KeyName: {get_param: KeyName}
Flavor: {get_param: OvercloudBlockStorageFlavor}
UpdateIdentifier: {get_param: UpdateIdentifier}
Hostname:
@@ -688,7 +680,6 @@ resources:
resource_def:
type: OS::TripleO::ObjectStorage
properties:
- KeyName: {get_param: KeyName}
Flavor: {get_param: OvercloudSwiftStorageFlavor}
HashSuffix: {get_param: SwiftHashSuffix}
Image: {get_param: SwiftStorageImage}
@@ -723,7 +714,6 @@ resources:
type: OS::TripleO::CephStorage
properties:
Image: {get_param: CephStorageImage}
- KeyName: {get_param: KeyName}
Flavor: {get_param: OvercloudCephStorageFlavor}
ServiceNetMap: {get_param: ServiceNetMap}
UpdateIdentifier: {get_param: UpdateIdentifier}