Merge "Configure redis as incoming storage driver in gnocchi"

2 files changed, 11 insertions, 0 deletions

diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp
index 3953f04..a9f2955 100644
--- a/manifests/profile/base/gnocchi/api.pp
+++ b/manifests/profile/base/gnocchi/api.pp
@@ -105,6 +105,11 @@ class tripleo::profile::base::gnocchi::api (
     class { '::gnocchi::storage':
       coordination_url => join(['redis://:', $gnocchi_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/']),
     }
+
+    class { '::gnocchi::storage::incoming::redis':
+      redis_url => join(['redis://:', $gnocchi_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/']),
+    }
+
     case $gnocchi_backend {
       'swift': {
         include ::gnocchi::storage::swift
diff --git a/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb b/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb
index 90bdea0..60e82b3 100644
--- a/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb
@@ -82,6 +82,9 @@ describe 'tripleo::profile::base::gnocchi::api' do
         is_expected.to contain_class('gnocchi::storage').with(
           :coordination_url => 'redis://:gnocchi@127.0.0.1:6379/'
         )
+        is_expected.to contain_class('gnocchi::storage::incoming::redis').with(
+          :redis_url => 'redis://:gnocchi@127.0.0.1:6379/'
+        )
         is_expected.to contain_class('gnocchi::storage::file')
       }
     end
@@ -100,6 +103,9 @@ describe 'tripleo::profile::base::gnocchi::api' do
         is_expected.to contain_class('gnocchi::storage').with(
           :coordination_url => 'redis://:gnocchi@127.0.0.1:6379/'
         )
+        is_expected.to contain_class('gnocchi::storage::incoming::redis').with(
+          :redis_url => 'redis://:gnocchi@127.0.0.1:6379/'
+        )
         is_expected.to contain_class('gnocchi::storage::ceph')
       }
     end