aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-25 19:48:32 +0000
committerGerrit Code Review <review@openstack.org>2017-04-25 19:48:32 +0000
commit8f9f1fff97de9fde76a3e28ca4d5082486529bae (patch)
tree862a6276ea9f329f52a844833b9116c17501fea3
parent9631eabac036ce7556a3c4882d05adea280ce052 (diff)
parent1b87b2e45fef05ea672094313874fa30d36f9626 (diff)
Merge "Deploy ceilometer_auth_enabled to node containing keystone" into stable/ocata
-rw-r--r--puppet/services/ceilometer-base.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml
index 3eb1d81..7dfcacd 100644
--- a/puppet/services/ceilometer-base.yaml
+++ b/puppet/services/ceilometer-base.yaml
@@ -88,7 +88,6 @@ outputs:
value:
service_name: ceilometer_base
config_settings:
- ceilometer_auth_enabled: true
ceilometer::debug: {get_param: Debug}
ceilometer::db::database_connection:
list_join:
@@ -129,6 +128,7 @@ outputs:
ceilometer::telemetry_secret: {get_param: CeilometerMeteringSecret}
service_config_settings:
keystone:
+ ceilometer_auth_enabled: true
ceilometer::keystone::auth::public_url: {get_param: [EndpointMap, CeilometerPublic, uri]}
ceilometer::keystone::auth::internal_url: {get_param: [EndpointMap, CeilometerInternal, uri]}
ceilometer::keystone::auth::admin_url: {get_param: [EndpointMap, CeilometerAdmin, uri]}