openstack/instack-undercloud
Code Issues Proposed changes

Merge "Run ceilometer api under wsgi on undercloud" into stable/newton

Browse Source
This commit is contained in:
Jenkins
2016-10-18 22:16:19 +00:00
committed by Gerrit Code Review
parent a7c0f152a6 420cd1d60d
commit fdacfdbd9d
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
elements/puppet-stack-config/puppet-stack-config.pp
View File

@@ -175,6 +175,7 @@ if str2bool(hiera('enable_telemetry', false)) {
include ::aodh::keystone::auth
include ::ceilometer
include ::ceilometer::api
include ::ceilometer::wsgi::apache
include ::ceilometer::db
include ::ceilometer::agent::notification
include ::ceilometer::agent::central

3
elements/puppet-stack-config/puppet-stack-config.yaml.template
View File

@@ -259,6 +259,9 @@ ceilometer::rabbit_userid: {{UNDERCLOUD_RABBIT_USERNAME}}
ceilometer::rabbit_password: {{UNDERCLOUD_RABBIT_PASSWORD}}
ceilometer::rabbit_host: {{LOCAL_IP}}
ceilometer::api::host: {{LOCAL_IP}}
ceilometer::api::service_name: 'httpd'
ceilometer::wsgi::apache::ssl: false
ceilometer::wsgi::apache::bind_host: {{LOCAL_IP}}
ceilometer::keystone::authtoken::password: {{UNDERCLOUD_CEILOMETER_PASSWORD}}
ceilometer::keystone::authtoken::auth_uri: "%{hiera('keystone_auth_uri')}"
ceilometer::keystone::authtoken::auth_url: "%{hiera('keystone_identity_uri')}"