aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-20 13:03:26 +0000
committerGerrit Code Review <review@openstack.org>2016-08-20 13:03:26 +0000
commit9b2281f8de84e730910342d40b12e37886203087 (patch)
tree1f7ddfc97f25c7a532ed78446f5ef7f743645e5e /overcloud.yaml
parente03627a05c5ebf89cd078692c06ea237a75b95e2 (diff)
parent885b37c80ecdae308289cc2e5c2a29dc66710487 (diff)
Merge "Pass ServiceNetMap to services"
Diffstat (limited to 'overcloud.yaml')
-rw-r--r--overcloud.yaml6
1 files changed, 5 insertions, 1 deletions
diff --git a/overcloud.yaml b/overcloud.yaml
index 3a272741..06994278 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -382,6 +382,7 @@ resources:
type: OS::TripleO::Services
properties:
Services: {get_param: ControllerServices}
+ ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
Controller:
@@ -416,10 +417,10 @@ resources:
ServiceNames: {get_attr: [ControllerServiceChain, role_data, service_names]}
ComputeServiceChain:
-
type: OS::TripleO::Services
properties:
Services: {get_param: ComputeServices}
+ ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
Compute:
@@ -452,6 +453,7 @@ resources:
type: OS::TripleO::Services
properties:
Services: {get_param: BlockStorageServices}
+ ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
BlockStorage:
@@ -482,6 +484,7 @@ resources:
type: OS::TripleO::Services
properties:
Services: {get_param: ObjectStorageServices}
+ ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
ObjectStorage:
@@ -513,6 +516,7 @@ resources:
type: OS::TripleO::Services
properties:
Services: {get_param: CephStorageServices}
+ ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
CephStorage: