summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-04 13:32:37 +0000
committerGerrit Code Review <review@openstack.org>2015-06-04 13:32:37 +0000
commit5c315de4bccd397b0a8b704bb2a48c62640e2370 (patch)
treefb4183849b3173748ef2ffdb9014a9aaeb82d5e9
parent61cbdb12f9d679361d3a8742fb58aae7e2a8cd91 (diff)
parentd413eb63f3d317c56b24282223f12dfacc0f9ae3 (diff)
Merge "Wire ServiceNetMap as a top level parameter"
-rw-r--r--compute.yaml6
-rw-r--r--controller.yaml6
-rw-r--r--overcloud-resource-registry-puppet.yaml24
-rw-r--r--overcloud-without-mergepy.yaml29
4 files changed, 39 insertions, 26 deletions
diff --git a/compute.yaml b/compute.yaml
index 8e5cdec7..05399531 100644
--- a/compute.yaml
+++ b/compute.yaml
@@ -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:
diff --git a/controller.yaml b/controller.yaml
index 403ef05a..4e541e92 100644
--- a/controller.yaml
+++ b/controller.yaml
@@ -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:
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index 42391762..e2a54088 100644
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -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
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 3094da79..cc30e800 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -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:
@@ -639,6 +666,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
@@ -695,6 +723,7 @@ resources:
RabbitClientPort: {get_param: RabbitClientPort}
SnmpdReadonlyUserName: {get_param: SnmpdReadonlyUserName}
SnmpdReadonlyUserPassword: {get_param: SnmpdReadonlyUserPassword}
+ ServiceNetMap: {get_param: ServiceNetMap}
BlockStorage:
type: OS::Heat::ResourceGroup