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
This commit is contained in:
Steven Hardy 2016-07-26 11:58:56 +01:00
parent 466274e287
commit fecd61e9a4
1 changed files with 0 additions and 10 deletions

View File

@ -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}