From 8779d1a5262c683d1b225b92408b6c633d28eed9 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Wed, 12 Apr 2017 13:53:44 -0600
Subject: Cover gnocchi api step 4 and 5

Update the gnocchi api to expose the redis information as a class
parameter so it can be tested correctly.

Change-Id: I075b4af5e7bb35f90f7b82f8fb1b6d6ad6363b71
(cherry picked from commit 4450afd495794a8ac0fc5b8c51d696416e5deb9d)
---
 manifests/profile/base/gnocchi/api.pp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'manifests/profile/base/gnocchi/api.pp')

diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp
index 029eb99..21b8325 100644
--- a/manifests/profile/base/gnocchi/api.pp
+++ b/manifests/profile/base/gnocchi/api.pp
@@ -55,6 +55,14 @@
 #   This is set by t-h-t.
 #   Defaults to hiera('gnocchi_api_network', undef)
 #
+# [*gnocchi_redis_password*]
+#  (Required) Password for the gnocchi redis user for the coordination url
+#  Defaults to hiera('gnocchi_redis_password')
+#
+# [*redis_vip*]
+#  (Required) Redis ip address for the coordination url
+#  Defaults to hiera('redis_vip')
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
@@ -67,6 +75,8 @@ class tripleo::profile::base::gnocchi::api (
   $generate_service_certificates = hiera('generate_service_certificates', false),
   $gnocchi_backend               = downcase(hiera('gnocchi_backend', 'swift')),
   $gnocchi_network               = hiera('gnocchi_api_network', undef),
+  $gnocchi_redis_password        = hiera('gnocchi_redis_password'),
+  $redis_vip                     = hiera('redis_vip'),
   $step                          = hiera('step'),
 ) {
   if $::hostname == downcase($bootstrap_node) {
@@ -107,7 +117,7 @@ class tripleo::profile::base::gnocchi::api (
 
   if $step >= 4 {
     class { '::gnocchi::storage':
-      coordination_url => join(['redis://:', hiera('gnocchi_redis_password'), '@', normalize_ip_for_uri(hiera('redis_vip')), ':6379/']),
+      coordination_url => join(['redis://:', $gnocchi_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/']),
     }
     case $gnocchi_backend {
       'swift': { include ::gnocchi::storage::swift }
-- 
cgit 1.2.3-korg