diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-07-14 23:11:34 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-07-14 23:11:34 +0000 |
commit | 07a5fe1ba66cbad5afafbbd30d2d78129cb90bae (patch) | |
tree | 1baecf44304a0c4a6459a1011312abfe65e6e5fd /puppet/services/cinder-api.yaml | |
parent | 66e1d882505a3335e290d1943a2d2b15909fd73f (diff) | |
parent | baf6eee5016fac7004a7b8be6f78d4505f347aeb (diff) |
Merge "Adds network/cidr mapping into a new service property"
Diffstat (limited to 'puppet/services/cinder-api.yaml')
-rw-r--r-- | puppet/services/cinder-api.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml index 47715a7e..fbfe532a 100644 --- a/puppet/services/cinder-api.yaml +++ b/puppet/services/cinder-api.yaml @@ -13,6 +13,10 @@ parameters: description: The password for the cinder service account, used by cinder-api. type: string hidden: true + ServiceData: + default: {} + description: Dictionary packing service data + type: json ServiceNetMap: default: {} description: Mapping of service_name -> network name. Typically set @@ -75,6 +79,7 @@ resources: ApacheServiceBase: type: ./apache.yaml properties: + ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} @@ -85,6 +90,7 @@ resources: CinderBase: type: ./cinder-base.yaml properties: + ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} |