diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-20 13:03:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-20 13:03:26 +0000 |
| commit | 9b2281f8de84e730910342d40b12e37886203087 (patch) | |
| tree | 1f7ddfc97f25c7a532ed78446f5ef7f743645e5e /puppet/services/cinder-volume.yaml | |
| parent | e03627a05c5ebf89cd078692c06ea237a75b95e2 (diff) | |
| parent | 885b37c80ecdae308289cc2e5c2a29dc66710487 (diff) | |
Merge "Pass ServiceNetMap to services"
Diffstat (limited to 'puppet/services/cinder-volume.yaml')
| -rw-r--r-- | puppet/services/cinder-volume.yaml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/services/cinder-volume.yaml b/puppet/services/cinder-volume.yaml index 9f49bc06..a438c188 100644 --- a/puppet/services/cinder-volume.yaml +++ b/puppet/services/cinder-volume.yaml @@ -42,6 +42,12 @@ parameters: CephClientUserName: default: openstack type: string + 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 @@ -53,6 +59,7 @@ resources: CinderBase: type: ./cinder-base.yaml properties: + ServiceNetMap: {get_param: ServiceNetMap} EndpointMap: {get_param: EndpointMap} outputs: |