From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 7 Sep 2016 17:38:49 +0000 (-0400)
Subject: gnocchi: move statsd and metricd at step5
X-Git-Tag: opnfv-6.0.0~590
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=488fb917a13d3a0780075a9356cda3783ccea002;p=apex-puppet-tripleo.git

gnocchi: move statsd and metricd at step5

Gnocchi statsd and metricd require Keystone resources to be in place
when using Swift backend, because those services will try to access to
Swift containers.

To do so, we want to move the service start at step 5 instead of 4 and
also require Keystone resource to be managed before starting the
services.

Change-Id: Ie5bc1481a8700c7cd080a76d0978146a84825767
Closes-Bug: #1621164
---

diff --git a/manifests/profile/base/gnocchi/metricd.pp b/manifests/profile/base/gnocchi/metricd.pp
index 4d7eb89..e69bbd5 100644
--- a/manifests/profile/base/gnocchi/metricd.pp
+++ b/manifests/profile/base/gnocchi/metricd.pp
@@ -28,7 +28,9 @@ class tripleo::profile::base::gnocchi::metricd (
 ) {
   include ::tripleo::profile::base::gnocchi
 
-  if $step >= 4 {
+  if $step >= 5 {
     include ::gnocchi::metricd
+    Keystone_endpoint<||> -> Service['gnocchi-metricd']
+    Keystone_user_role<||> -> Service['gnocchi-metricd']
   }
 }
diff --git a/manifests/profile/base/gnocchi/statsd.pp b/manifests/profile/base/gnocchi/statsd.pp
index 775b043..1fe4067 100644
--- a/manifests/profile/base/gnocchi/statsd.pp
+++ b/manifests/profile/base/gnocchi/statsd.pp
@@ -28,7 +28,9 @@ class tripleo::profile::base::gnocchi::statsd (
 ) {
   include ::tripleo::profile::base::gnocchi
 
-  if $step >= 4 {
+  if $step >= 5 {
     include ::gnocchi::statsd
+    Keystone_endpoint<||> -> Service['gnocchi-statsd']
+    Keystone_user_role<||> -> Service['gnocchi-statsd']
   }
 }