3 files changed, 10 insertions, 4 deletions
diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp
index 5e7e215..9a08551 100644
--- a/manifests/profile/base/gnocchi/api.pp
+++ b/manifests/profile/base/gnocchi/api.pp
@@ -45,14 +45,16 @@ class tripleo::profile::base::gnocchi::api (
   include ::tripleo::profile::base::gnocchi
 
   if $step >= 3 and $sync_db {
-    include ::gnocchi::db::mysql
     include ::gnocchi::db::sync
   }
 
   if $step >= 4 {
     include ::gnocchi::api
     include ::gnocchi::wsgi::apache
-    include ::gnocchi::storage
+
+    class { '::gnocchi::storage':
+      coordination_url => join(['redis://:', hiera('gnocchi_redis_password'), '@', normalize_ip_for_uri(hiera('redis_vip')), ':6379/']),
+    }
     case $gnocchi_backend {
       'swift': { include ::gnocchi::storage::swift }
       'file': { include ::gnocchi::storage::file }
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']
   }
 }