summaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-02 03:53:20 +0000
committerGerrit Code Review <review@openstack.org>2017-04-02 03:53:20 +0000
commit2e7fbe1d95cf0d57724f4acc4bd51d35ed756b4a (patch)
tree4606646a5de0d670631629a230e2581b03b42dd8 /manifests
parent1d31e6e4bfd5896758429ad793375f40ca8ff84e (diff)
parent38e4976b7b80487e26c75ece20bab631597240a3 (diff)
Merge "Decouple ceilometer user create from API"
Diffstat (limited to 'manifests')
-rw-r--r--manifests/profile/base/keystone.pp5
1 files changed, 4 insertions, 1 deletions
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index 9598d64..bb3f387 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -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) {