Merge "Move *Flavor parameters into per-role templates"

This commit is contained in:
Jenkins 2016-08-09 02:45:31 +00:00 committed by Gerrit Code Review
commit 6bba45ac28
6 changed files with 14 additions and 44 deletions

View File

@ -124,12 +124,6 @@ parameters:
description: |
Deprecated. Use ControllerExtraConfig via parameter_defaults instead.
type: json
OvercloudControlFlavor:
description: Flavor for control nodes to request when deploying.
default: baremetal
type: string
constraints:
- custom_constraint: nova.flavor
ExtraConfig:
default: {}
description: |
@ -186,12 +180,6 @@ parameters:
default: 'neutron'
description: The full class name of the security API class
type: string
OvercloudComputeFlavor:
description: Use this flavor
default: baremetal
type: string
constraints:
- custom_constraint: nova.flavor
ServiceNetMap:
default:
NeutronTenantNetwork: tenant
@ -319,12 +307,6 @@ parameters:
BlockStorageCount:
type: number
default: 0
OvercloudBlockStorageFlavor:
description: Flavor for block storage nodes to request when deploying.
default: baremetal
type: string
constraints:
- custom_constraint: nova.flavor
BlockStorageExtraConfig:
default: {}
description: |
@ -347,12 +329,6 @@ parameters:
ObjectStorageCount:
type: number
default: 0
OvercloudSwiftStorageFlavor:
description: Flavor for Swift storage nodes to request when deploying.
default: baremetal
type: string
constraints:
- custom_constraint: nova.flavor
ObjectStorageExtraConfig:
default: {}
description: |
@ -378,12 +354,6 @@ parameters:
CephStorageCount:
type: number
default: 0
OvercloudCephStorageFlavor:
default: baremetal
description: Flavor for Ceph storage nodes to request when deploying.
type: string
constraints:
- custom_constraint: nova.flavor
CephStorageExtraConfig:
default: {}
description: |
@ -535,7 +505,6 @@ resources:
type: OS::TripleO::Controller
properties:
controllerExtraConfig: {get_param: controllerExtraConfig}
Flavor: {get_param: OvercloudControlFlavor}
HeatAuthEncryptionKey: {get_resource: HeatAuthEncryptionKey}
HorizonSecret: {get_resource: HorizonSecret}
MysqlClusterUniquePart: {get_attr: [MysqlClusterUniquePart, value]}
@ -577,7 +546,6 @@ resources:
CinderEnableRbdBackend: {get_param: CinderEnableRbdBackend}
Debug: {get_param: Debug}
ExtraConfig: {get_param: ExtraConfig}
Flavor: {get_param: OvercloudComputeFlavor}
GlanceHost: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]}
KeystoneAdminApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}
KeystonePublicApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]}
@ -630,7 +598,6 @@ resources:
resource_def:
type: OS::TripleO::BlockStorage
properties:
Flavor: {get_param: OvercloudBlockStorageFlavor}
UpdateIdentifier: {get_param: UpdateIdentifier}
Hostname:
str_replace:
@ -661,7 +628,6 @@ resources:
resource_def:
type: OS::TripleO::ObjectStorage
properties:
Flavor: {get_param: OvercloudSwiftStorageFlavor}
HashSuffix: {get_param: SwiftHashSuffix}
UpdateIdentifier: {get_param: UpdateIdentifier}
ServiceNetMap: {get_param: ServiceNetMap}
@ -693,7 +659,6 @@ resources:
resource_def:
type: OS::TripleO::CephStorage
properties:
Flavor: {get_param: OvercloudCephStorageFlavor}
ServiceNetMap: {get_param: ServiceNetMap}
UpdateIdentifier: {get_param: UpdateIdentifier}
Hostname:

View File

@ -1,8 +1,9 @@
heat_template_version: 2015-04-30
description: 'OpenStack ceph storage node configured by Puppet'
parameters:
Flavor:
OvercloudCephStorageFlavor:
description: Flavor for the Ceph Storage node.
default: baremetal
type: string
constraints:
- custom_constraint: nova.flavor
@ -108,7 +109,7 @@ resources:
properties:
image: {get_param: CephStorageImage}
image_update_policy: {get_param: ImageUpdatePolicy}
flavor: {get_param: Flavor}
flavor: {get_param: OvercloudCephStorageFlavor}
key_name: {get_param: KeyName}
networks:
- network: ctlplane

View File

@ -20,9 +20,10 @@ parameters:
BlockStorageIPs:
default: {}
type: json
Flavor:
OvercloudBlockStorageFlavor:
description: Flavor for block storage nodes to request when deploying.
type: string
default: baremetal
constraints:
- custom_constraint: nova.flavor
KeyName:

View File

@ -40,8 +40,9 @@ parameters:
Additional hiera configuration to inject into the cluster. Note
that NovaComputeExtraConfig takes precedence over ExtraConfig.
type: json
Flavor:
OvercloudComputeFlavor:
description: Flavor for the nova compute node
default: baremetal
type: string
constraints:
- custom_constraint: nova.flavor
@ -231,7 +232,7 @@ resources:
image: {get_param: NovaImage}
image_update_policy:
get_param: ImageUpdatePolicy
flavor: {get_param: Flavor}
flavor: {get_param: OvercloudComputeFlavor}
key_name: {get_param: KeyName}
networks:
- network: ctlplane

View File

@ -93,8 +93,9 @@ parameters:
]
}
type: json
Flavor:
OvercloudControlFlavor:
description: Flavor for control nodes to request when deploying.
default: baremetal
type: string
constraints:
- custom_constraint: nova.flavor
@ -342,7 +343,7 @@ resources:
properties:
image: {get_param: controllerImage}
image_update_policy: {get_param: ImageUpdatePolicy}
flavor: {get_param: Flavor}
flavor: {get_param: OvercloudControlFlavor}
key_name: {get_param: KeyName}
networks:
- network: ctlplane

View File

@ -1,8 +1,9 @@
heat_template_version: 2015-04-30
description: 'OpenStack swift storage node configured by Puppet'
parameters:
Flavor:
OvercloudSwiftStorageFlavor:
description: Flavor for Swift storage nodes to request when deploying.
default: baremetal
type: string
constraints:
- custom_constraint: nova.flavor
@ -115,7 +116,7 @@ resources:
command: {get_param: ConfigCommand}
properties:
image: {get_param: SwiftStorageImage}
flavor: {get_param: Flavor}
flavor: {get_param: OvercloudSwiftStorageFlavor}
key_name: {get_param: KeyName}
networks:
- network: ctlplane