From: Pradeep Kilambi <pkilambi@redhat.com>
Date: Wed, 29 Mar 2017 19:07:36 +0000 (-0400)
Subject: Decouple ceilometer user create from API
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=12e6b07527a9d9c3b1c36b15805a6a1dcced6f5b;p=apex-puppet-tripleo.git

Decouple ceilometer user create from API

Ceilometer user is needed for other ceilometer services to
authenticate with keystone even when API is not present.
So the data can be dispatched to gnocchi. Lets keep these
separate so user always exists even when api is not.

Depends-On: Iffebd40752eafb1d30b5962da8b5624fb9df7d48

Closes-bug: #1677354

Change-Id: I8f4e543a7cef5e50a35a191fe20e276d518daf20
(cherry picked from commit 38e4976b7b80487e26c75ece20bab631597240a3)
---

diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index 999bcf6..8d8c235 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -196,7 +196,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) {
diff --git a/releasenotes/notes/create-ceilo-user-for-gnocchi-b8a4d5ea2f2375a9.yaml b/releasenotes/notes/create-ceilo-user-for-gnocchi-b8a4d5ea2f2375a9.yaml
new file mode 100644
index 0000000..07407f2
--- /dev/null
+++ b/releasenotes/notes/create-ceilo-user-for-gnocchi-b8a4d5ea2f2375a9.yaml
@@ -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.