aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud.yaml
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2016-07-26 11:58:56 +0100
committerSteven Hardy <shardy@redhat.com>2016-07-27 17:04:59 +0100
commitfecd61e9a4a08777b2609e0c6938193dc149d350 (patch)
tree5a29a43a2aaf5bec30292f75e5d8173357d5efe6 /overcloud.yaml
parent466274e28712d913528742be3293266743062a45 (diff)
Remove KeyName parameter from overcloud template
This is already defined in all the per-role templates and is passed via parameter_defaults: Change-Id: Ifde54d3d29a3f0754f0f05740d6b6030aa871d38 Partially-Implements: blueprint custom-roles
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 3ed879b8..2c94fc7c 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
@@ -598,7 +592,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}
@@ -651,7 +644,6 @@ resources:
type: OS::TripleO::BlockStorage
properties:
Image: {get_param: BlockStorageImage}
- KeyName: {get_param: KeyName}
Flavor: {get_param: OvercloudBlockStorageFlavor}
UpdateIdentifier: {get_param: UpdateIdentifier}
Hostname:
@@ -683,7 +675,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}
@@ -718,7 +709,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}