summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-26 20:15:16 +0000
committerGerrit Code Review <review@openstack.org>2016-08-26 20:15:16 +0000
commitc5bcf0b17cf25f44b1808927f57f33a1acf0c6d0 (patch)
tree4b1f576d91cbf454377268477861825c864bf36a /puppet
parent7c8874c920c42b3c78ba140e895aa1884d6a1d29 (diff)
parent241b88c6130486b775b10d4ce786f2cebfbc37a3 (diff)
Merge "Move ceilometer api to run under apache wsgi"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/ceilometer-api.yaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/puppet/services/ceilometer-api.yaml b/puppet/services/ceilometer-api.yaml
index 85b9aacc..201a2b7b 100644
--- a/puppet/services/ceilometer-api.yaml
+++ b/puppet/services/ceilometer-api.yaml
@@ -47,6 +47,9 @@ outputs:
# internal_api -> IP
# internal_api_uri -> [IP]
# internal_api_subnet - > IP/CIDR
+ - ceilometer::api::service_name: 'httpd'
ceilometer::api::host: {get_param: [ServiceNetMap, CeilometerApiNetwork]}
+ ceilometer::wsgi::apache::bind_host: {get_param: [ServiceNetMap, CeilometerApiNetwork]}
+ ceilometer::wsgi::apache::ssl: false
step_config: |
include ::tripleo::profile::base::ceilometer::api