Merge "Decouple ceilometer user create from API"

This commit is contained in:
Jenkins 2017-04-02 03:53:20 +00:00 committed by Gerrit Code Review
commit 2e7fbe1d95
2 changed files with 9 additions and 1 deletions

View File

@ -246,7 +246,10 @@ class tripleo::profile::base::keystone (
if hiera('barbican_api_enabled', false) {
include ::barbican::keystone::auth
}
if hiera('ceilometer_api_enabled', false) {
# ceilometer user is needed even when ceilometer api
# not running, so it can authenticate with keystone
# and dispatch data.
if hiera('ceilometer_auth_enabled', false) {
include ::ceilometer::keystone::auth
}
if hiera('ceph_rgw_enabled', false) {

View File

@ -0,0 +1,5 @@
---
fixes:
- We need ceilometer user in cases where ceilometer API is disabled.
This is to ensure other ceilometer services can still authenticate
with keystone.