diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-30 17:35:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-30 17:35:18 +0000 |
| commit | 5dccc05da37f3f13cf72a941edb0be28447bca1c (patch) | |
| tree | 170bb8d5c84c37d756c6e4d5b3df6ce1d5940e41 /puppet/services/gnocchi-api.yaml | |
| parent | 6a1f17154f4c64f7a0b61439781a7c868906d956 (diff) | |
| parent | e3cb92a5db51eb80d0806a9bf42b689756a4ac9f (diff) | |
Merge "Mv Nova, Neutron, Horizon out of controller.yaml"
Diffstat (limited to 'puppet/services/gnocchi-api.yaml')
| -rw-r--r-- | puppet/services/gnocchi-api.yaml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/puppet/services/gnocchi-api.yaml b/puppet/services/gnocchi-api.yaml index ec42f3f5..dc6e7de7 100644 --- a/puppet/services/gnocchi-api.yaml +++ b/puppet/services/gnocchi-api.yaml @@ -35,6 +35,7 @@ parameters: description: Keystone region for endpoint resources: + GnocchiServiceBase: type: ./gnocchi-base.yaml properties: @@ -42,6 +43,13 @@ resources: DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} + ApacheServiceBase: + type: ./apache.yaml + properties: + ServiceNetMap: {get_param: ServiceNetMap} + DefaultPasswords: {get_param: DefaultPasswords} + EndpointMap: {get_param: EndpointMap} + outputs: role_data: description: Role data for the Gnocchi role. @@ -49,6 +57,7 @@ outputs: service_name: gnocchi_api config_settings: map_merge: + - get_attr: [ApacheServiceBase, role_data, config_settings] - get_attr: [GnocchiServiceBase, role_data, config_settings] - tripleo.gnocchi_api.firewall_rules: '129 gnocchi-api': |