Wire ServiceNetMap as a top level parameter
This patch makes ServiceNetMap a top level parameter. This is helpful to tools like Tuskar which don't support Heat environments that contain both a resource_registry and default_parameters. ServiceNetMap will in fact be utilized at the top level in some of the VIP related patches that follow. Change-Id: I375063dacf5f3fc68e6df93e11c3e88f48aa3c3a
This commit is contained in:
parent
eaa5eb6a59
commit
d413eb63f3
|
@ -243,7 +243,11 @@ parameters:
|
|||
description: The user password for SNMPd with readonly rights running on all Overcloud nodes
|
||||
type: string
|
||||
hidden: true
|
||||
|
||||
ServiceNetMap:
|
||||
default: {}
|
||||
description: Mapping of service_name -> network name. Typically set
|
||||
via parameter_defaults in the resource registry.
|
||||
type: json
|
||||
|
||||
resources:
|
||||
|
||||
|
|
|
@ -418,7 +418,11 @@ parameters:
|
|||
VirtualIP:
|
||||
type: string
|
||||
default: '' # Has to be here because of the ignored empty value bug
|
||||
|
||||
ServiceNetMap:
|
||||
default: {}
|
||||
description: Mapping of service_name -> network name. Typically set
|
||||
via parameter_defaults in the resource registry.
|
||||
type: json
|
||||
|
||||
resources:
|
||||
|
||||
|
|
|
@ -63,27 +63,3 @@ resource_registry:
|
|||
|
||||
parameter_defaults:
|
||||
EnablePackageInstall: false
|
||||
# Mapping of service_name -> network name.
|
||||
ServiceNetMap:
|
||||
NeutronLocalIp: tenant
|
||||
CeilometerApiNetwork: internal_api
|
||||
MongoDbNetwork: internal_api
|
||||
CinderApiNetwork: internal_api
|
||||
CinderIscsiNetwork: storage
|
||||
GlanceApiNetwork: storage
|
||||
GlanceRegistryNetwork: internal_api
|
||||
KeystoneAdminApiNetwork: internal_api
|
||||
KeystonePublicApiNetwork: external
|
||||
NeutronApiNetwork: internal_api
|
||||
HeatApiNetwork: internal_api
|
||||
HeatApiCfnNetwork: internal_api
|
||||
HeatApiCloudwatchNetwork: internal_api
|
||||
NovaApiNetwork: internal_api
|
||||
NovaMetadataNetwork: internal_api
|
||||
SwiftMgmtNetwork: storage_mgmt
|
||||
SwiftProxyNetwork: storage
|
||||
HorizonNetwork: external
|
||||
MemcachedNetwork: internal_api
|
||||
RabbitMqNetwork: internal_api
|
||||
RedisNetwork: internal_api
|
||||
MysqlNetwork: internal_api
|
||||
|
|
|
@ -494,6 +494,33 @@ parameters:
|
|||
type: string
|
||||
constraints:
|
||||
- custom_constraint: nova.flavor
|
||||
ServiceNetMap:
|
||||
default:
|
||||
NeutronLocalIp: tenant
|
||||
CeilometerApiNetwork: internal_api
|
||||
MongoDbNetwork: internal_api
|
||||
CinderApiNetwork: internal_api
|
||||
CinderIscsiNetwork: storage
|
||||
GlanceApiNetwork: storage
|
||||
GlanceRegistryNetwork: internal_api
|
||||
KeystoneAdminApiNetwork: internal_api
|
||||
KeystonePublicApiNetwork: external
|
||||
NeutronApiNetwork: internal_api
|
||||
HeatApiNetwork: internal_api
|
||||
HeatApiCfnNetwork: internal_api
|
||||
HeatApiCloudwatchNetwork: internal_api
|
||||
NovaApiNetwork: internal_api
|
||||
NovaMetadataNetwork: internal_api
|
||||
SwiftMgmtNetwork: storage_mgmt
|
||||
SwiftProxyNetwork: storage
|
||||
HorizonNetwork: external
|
||||
MemcachedNetwork: internal_api
|
||||
RabbitMqNetwork: internal_api
|
||||
RedisNetwork: internal_api
|
||||
MysqlNetwork: internal_api
|
||||
description: Mapping of service_name -> network name. Typically set
|
||||
via parameter_defaults in the resource registry.
|
||||
type: json
|
||||
|
||||
# Block storage specific parameters
|
||||
BlockStorageCount:
|
||||
|
@ -638,6 +665,7 @@ resources:
|
|||
SwiftReplicas: { get_param: SwiftReplicas}
|
||||
VirtualIP: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
|
||||
PublicVirtualIP: {get_attr: [PublicVirtualIP, fixed_ips, 0, ip_address]}
|
||||
ServiceNetMap: {get_param: ServiceNetMap}
|
||||
|
||||
Compute:
|
||||
type: OS::Heat::ResourceGroup
|
||||
|
@ -694,6 +722,7 @@ resources:
|
|||
RabbitClientPort: {get_param: RabbitClientPort}
|
||||
SnmpdReadonlyUserName: {get_param: SnmpdReadonlyUserName}
|
||||
SnmpdReadonlyUserPassword: {get_param: SnmpdReadonlyUserPassword}
|
||||
ServiceNetMap: {get_param: ServiceNetMap}
|
||||
|
||||
BlockStorage:
|
||||
type: OS::Heat::ResourceGroup
|
||||
|
|
Loading…
Reference in New Issue