Support Redis Sentinel setup

Redis can be run as a service or/and as a service with Sentinel
clustering system.
This patch allows to have a flexibility when deploying the nodes and
define the role by Hiera.

Change-Id: I45f397d87a8bb54f1c579a2e5c892c3bab7d3189

manifests/database/nosql/redis/sentinel.pp

@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2015 eNovance SAS <licensing@enovance.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# == Class: cloud::database::nosql::redis::sentinel
+#
+# Install a Redis sentinel node (used by OpenStack & monitoring services)
+#
+# === Parameters:
+#
+# [*port*]
+#   (optional) Port where Redis is binded.
+#   Used for firewall purpose.
+#   Default to 26379
+#
+# [*firewall_settings*]
+#   (optional) Allow to add custom parameters to firewall rules
+#   Should be an hash.
+#   Default to {}
+#
+class cloud::database::nosql::redis::sentinel(
+  $port              = 26379,
+  $firewall_settings = {},
+) {
+
+  include ::redis::sentinel
+
+  if $::cloud::manage_firewall {
+    cloud::firewall::rule{ '100 allow redis sentinel access':
+      port   => $port,
+      extras => $firewall_settings,
+    }
+  }
+
+}

manifests/database/nosql/redis/server.pp

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-# == Class: cloud::database::nosql::redis
+# == Class: cloud::database::nosql::redis::server
 #
 # Install a Redis server (used by OpenStack & monitoring services)
 #
@@ -29,7 +29,7 @@
 #   Should be an hash.
 #   Default to {}
 #
-class cloud::database::nosql::redis(
+class cloud::database::nosql::redis::server(
   $port              = 6379,
   $firewall_settings = {},
 ) {
@@ -37,7 +37,7 @@ class cloud::database::nosql::redis(
   include ::redis
 
   if $::cloud::manage_firewall {
-    cloud::firewall::rule{ '100 allow redis access':
+    cloud::firewall::rule{ '100 allow redis server access':
       port   => $port,
       extras => $firewall_settings,
     }

spec/classes/cloud_database_nosql_redis_sentinel_spec.rb

@@ -0,0 +1,79 @@
+#
+# Copyright (C) 2014 eNovance SAS <licensing@enovance.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# Unit tests for cloud::cache::redis::sentinel
+#
+
+require 'spec_helper'
+
+describe 'cloud::database::nosql::redis::sentinel' do
+
+  shared_examples_for 'redis sentinel' do
+
+    let :params do
+      { :port => '26379' }
+    end
+
+    it { should create_class('redis::sentinel') }
+
+    context 'with default firewall enabled' do
+      let :pre_condition do
+        "class { 'cloud': manage_firewall => true }"
+      end
+      it 'configure redis firewall rules' do
+        is_expected.to contain_firewall('100 allow redis sentinel access').with(
+          :port   => '26379',
+          :proto  => 'tcp',
+          :action => 'accept',
+        )
+      end
+    end
+
+    context 'with custom firewall enabled' do
+      let :pre_condition do
+        "class { 'cloud': manage_firewall => true }"
+      end
+      before :each do
+        params.merge!(:firewall_settings => { 'limit' => '50/sec' } )
+      end
+      it 'configure redis firewall rules with custom parameter' do
+        is_expected.to contain_firewall('100 allow redis sentinel access').with(
+          :port   => '26379',
+          :proto  => 'tcp',
+          :action => 'accept',
+          :limit  => '50/sec',
+        )
+      end
+    end
+
+  end
+
+  context 'on Debian platforms' do
+    let :facts do
+      { :osfamily => 'Debian' }
+    end
+
+    it_configures 'redis sentinel'
+  end
+
+  context 'on RedHat platforms' do
+    let :facts do
+      { :osfamily => 'RedHat' }
+    end
+
+    it_configures 'redis sentinel'
+  end
+
+end

spec/classes/cloud_database_nosql_redis_server_spec.rb

@@ -13,12 +13,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-# Unit tests for cloud::cache::redis
+# Unit tests for cloud::cache::redis::server
 #
 
 require 'spec_helper'
 
-describe 'cloud::database::nosql::redis' do
+describe 'cloud::database::nosql::redis::server' do
 
   shared_examples_for 'redis server' do
 
@@ -33,7 +33,7 @@ describe 'cloud::database::nosql::redis' do
         "class { 'cloud': manage_firewall => true }"
       end
       it 'configure redis firewall rules' do
-        is_expected.to contain_firewall('100 allow redis access').with(
+        is_expected.to contain_firewall('100 allow redis server access').with(
           :port   => '6379',
           :proto  => 'tcp',
           :action => 'accept',
@@ -49,7 +49,7 @@ describe 'cloud::database::nosql::redis' do
         params.merge!(:firewall_settings => { 'limit' => '50/sec' } )
       end
       it 'configure redis firewall rules with custom parameter' do
-        is_expected.to contain_firewall('100 allow redis access').with(
+        is_expected.to contain_firewall('100 allow redis server access').with(
           :port   => '6379',
           :proto  => 'tcp',
           :action => 'accept',