diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-08-26 12:41:53 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-08-30 08:59:07 -0400 |
| commit | e3cb92a5db51eb80d0806a9bf42b689756a4ac9f (patch) | |
| tree | 770d11ce23f6830cf63fd802e1b59c3c902fb4d5 /puppet/services/ceilometer-api.yaml | |
| parent | a02cee9e3ba1311c5782365914ca0758ff413dec (diff) | |
Mv Nova, Neutron, Horizon out of controller.yaml
This patch moves the settings for Nova, Neutron, and Horizon
out of controller.yaml.
Also fixes the NovaPassword settings in nova-base.yaml
so they don't use get_input.
Also, creates a new apache.yaml base service to contain shared
apache settings for several services which use Apache for WSGI.
Co-Authored-By: Giulio Fidente <gfidente@redhat.com>
Change-Id: I35d909bd5abc23976b5732a2b9af31cf1448838e
Related-bug: #1604414
Diffstat (limited to 'puppet/services/ceilometer-api.yaml')
| -rw-r--r-- | puppet/services/ceilometer-api.yaml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/puppet/services/ceilometer-api.yaml b/puppet/services/ceilometer-api.yaml index 201a2b7b..2baac511 100644 --- a/puppet/services/ceilometer-api.yaml +++ b/puppet/services/ceilometer-api.yaml @@ -28,6 +28,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 Ceilometer API role. @@ -35,6 +42,7 @@ outputs: service_name: ceilometer_api config_settings: map_merge: + - get_attr: [ApacheServiceBase, role_data, config_settings] - get_attr: [CeilometerServiceBase, role_data, config_settings] - tripleo.ceilometer_api.firewall_rules: '124 ceilometer': |