diff --git a/manifests/storage/incoming/redis.pp b/manifests/storage/incoming/redis.pp
new file mode 100644
index 00000000..879ea4aa
--- /dev/null
+++ b/manifests/storage/incoming/redis.pp
@@ -0,0 +1,22 @@
+#
+# gnocchi::storage::incoming::redis
+#
+# Redis incoming storage driver for Gnocchi
+#
+# == Parameters
+#
+# [*redis_url*]
+#   (optional) Redis url.
+#
+class gnocchi::storage::incoming::redis(
+  $redis_url = undef,
+) {
+
+  include ::gnocchi::deps
+
+  gnocchi_config {
+    'incoming/driver':        value => 'redis';
+    'incoming/redis_url':     value => $redis_url;
+  }
+
+}
diff --git a/spec/classes/gnocchi_storage_incoming_redis_spec.rb b/spec/classes/gnocchi_storage_incoming_redis_spec.rb
new file mode 100644
index 00000000..4d9f015a
--- /dev/null
+++ b/spec/classes/gnocchi_storage_incoming_redis_spec.rb
@@ -0,0 +1,37 @@
+#
+# Unit tests for gnocchi::storage::incoming::redis
+#
+
+require 'spec_helper'
+
+describe 'gnocchi::storage::incoming::redis' do
+
+  let :params do
+    { :redis_url => 'http://localhost:6378' }
+  end
+
+  shared_examples_for 'gnocchi storage redis' do
+
+    it { is_expected.to contain_class('gnocchi::deps') }
+
+    context 'with redis' do
+      it 'configures gnocchi incoming driver with redis' do
+        is_expected.to contain_gnocchi_config('incoming/driver').with_value('redis')
+        is_expected.to contain_gnocchi_config('incoming/redis_url').with_value('http://localhost:6378')
+      end
+    end
+  end
+
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge!(OSDefaults.get_facts())
+      end
+
+      it_behaves_like 'gnocchi storage redis'
+    end
+  end
+
+end