summaryrefslogtreecommitdiffstats
path: root/puppet/services/cinder-api.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 /puppet/services/cinder-api.yaml
parente03627a05c5ebf89cd078692c06ea237a75b95e2 (diff)
parent885b37c80ecdae308289cc2e5c2a29dc66710487 (diff)
Merge "Pass ServiceNetMap to services"
Diffstat (limited to 'puppet/services/cinder-api.yaml')
-rw-r--r--puppet/services/cinder-api.yaml7
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml
index 3568cb06..c4e5854a 100644
--- a/puppet/services/cinder-api.yaml
+++ b/puppet/services/cinder-api.yaml
@@ -13,6 +13,12 @@ parameters:
description: The password for the cinder service account, used by cinder-api.
type: string
hidden: true
+ ServiceNetMap:
+ default: {}
+ description: Mapping of service_name -> network name. Typically set
+ via parameter_defaults in the resource registry. This
+ mapping overrides those in ServiceNetMapDefaults.
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@ -28,6 +34,7 @@ resources:
CinderBase:
type: ./cinder-base.yaml
properties:
+ ServiceNetMap: {get_param: ServiceNetMap}
EndpointMap: {get_param: EndpointMap}
outputs: