.fixtures.yml

@@ -2,6 +2,7 @@ fixtures:
   repositories:
     apt: 'git://github.com/puppetlabs/puppetlabs-apt.git'
     stdlib: 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
+    epel: 'https://github.com/stahnma/puppet-module-epel.git'
 
   symlinks:
     redis: "#{source_dir}"

.travis.yml

@@ -1,28 +1,26 @@
+---
 language: ruby
-
-cache: bundler
+sudo: false
 
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1.3
 
 matrix:
   allow_failures:
-    - rvm: 1.8.7
-    - rvm: 2.0.0
-      env: PUPPET_VERSION="2.7"
-    - env: PUPPET_VERSION="2.7"
-    - env: PUPPET_VERSION="4.0"
+    - env: PUPPET_VERSION="3.7" FUTURE_PARSER="yes"
+    - env: PUPPET_VERSION="3.8" FUTURE_PARSER="yes"
 
 before_install:
   - 'gem install bundler'
 
 script:
-  - 'bundle exec rake spec'
+  - bundle install
+  - bundle update
+  - bundle exec rake
 
 env:
-  - PUPPET_VERSION="2.7"
   - PUPPET_VERSION="3.0"
   - PUPPET_VERSION="3.1"
   - PUPPET_VERSION="3.2"
@@ -31,10 +29,9 @@ env:
   - PUPPET_VERSION="3.5"
   - PUPPET_VERSION="3.6"
   - PUPPET_VERSION="3.7"
+  - PUPPET_VERSION="3.7" FUTURE_PARSER="yes"
+  - PUPPET_VERSION="3.8"
+  - PUPPET_VERSION="3.8" FUTURE_PARSER="yes"
   - PUPPET_VERSION="4.0"
-
-branches:
-  only:
-    - master
-    - develop
-
+  - PUPPET_VERSION="4.1"
+  - PUPPET_VERSION="4.2"

README.md

@@ -26,6 +26,16 @@
       #masterauth  => 'secret';
     }
 
+### Redis 3.0 Clustering
+
+    class { 'redis':
+      bind                 => '10.0.1.2',
+      appendonly           => true,
+      cluster_enabled      => true,
+      cluster_config_file  => 'nodes.conf',
+      cluster_node_timeout => 5000,
+    }
+
 ### Manage repositories
 
 Disabled by default but if you really want the module to manage the required

manifests/config.pp

@@ -36,13 +36,17 @@
   $slowlog_max_len              = $::redis::slowlog_max_len
   $hash_max_ziplist_entries     = $::redis::hash_max_ziplist_entries
   $hash_max_ziplist_value       = $::redis::hash_max_ziplist_value
+  $hz                           = $::redis::hz
   $list_max_ziplist_entries     = $::redis::list_max_ziplist_entries
   $list_max_ziplist_value       = $::redis::list_max_ziplist_value
   $set_max_intset_entries       = $::redis::set_max_intset_entries
   $zset_max_ziplist_entries     = $::redis::zset_max_ziplist_entries
   $zset_max_ziplist_value       = $::redis::zset_max_ziplist_value
   $activerehashing              = $::redis::activerehashing
   $extra_config_file            = $::redis::extra_config_file
+  $cluster_enabled              = $::redis::cluster_enabled
+  $cluster_config_file          = $::redis::cluster_config_file
+  $cluster_node_timeout         = $::redis::cluster_node_timeout
 
   if $::redis::notify_service {
     File {

manifests/init.pp

@@ -100,6 +100,11 @@
 #
 #   Default: 64
 #
+# [*hz*]
+#   Set redis background tasks frequency
+#
+#   Default: 10
+#
 # [*list_max_ziplist_entries*]
 #   Set max ziplist entries for lists.
 #
@@ -274,6 +279,11 @@
 #
 #   Default: OS dependant
 #
+# [*service_provider*]
+#   Specify the service provider to use
+#
+#   Default: undef
+#
 # [*service_user*]
 #   Specify which user to run as.
 #
@@ -358,6 +368,23 @@
 #
 #   Default: 64
 #
+# [*cluster_enabled*]
+#   Enables redis 3.0 cluster functionality
+#
+#   Default: false
+#
+# [*cluster_config_file*]
+#   Config file for saving cluster nodes configuration. This file is never touched by humans.
+#   Only set if cluster_enabled is true
+#
+#   Default: nodes.conf
+#
+# [*cluster_node_timeout*]
+#   Node timeout
+#   Only set if cluster_enabled is true
+#
+#   Default: 5000
+#
 # == Actions:
 #   - Install and configure Redis
 #
@@ -389,6 +416,7 @@
   $extra_config_file           = $::redis::params::extra_config_file,
   $hash_max_ziplist_entries    = $::redis::params::hash_max_ziplist_entries,
   $hash_max_ziplist_value      = $::redis::params::hash_max_ziplist_value,
+  $hz                          = $::redis::params::hz,
   $list_max_ziplist_entries    = $::redis::params::list_max_ziplist_entries,
   $list_max_ziplist_value      = $::redis::params::list_max_ziplist_value,
   $log_dir                     = $::redis::params::log_dir,
@@ -420,6 +448,7 @@
   $service_hasstatus           = $::redis::params::service_hasstatus,
   $service_manage              = $::redis::params::service_manage,
   $service_name                = $::redis::params::service_name,
+  $service_provider            = $::redis::params::service_provider,
   $service_user                = $::redis::params::service_user,
   $set_max_intset_entries      = $::redis::params::set_max_intset_entries,
   $slave_read_only             = $::redis::params::slave_read_only,
@@ -434,6 +463,9 @@
   $workdir                     = $::redis::params::workdir,
   $zset_max_ziplist_entries    = $::redis::params::zset_max_ziplist_entries,
   $zset_max_ziplist_value      = $::redis::params::zset_max_ziplist_value,
+  $cluster_enabled             = $::redis::params::cluster_enabled,
+  $cluster_config_file         = $::redis::params::cluster_config_file,
+  $cluster_node_timeout        = $::redis::params::cluster_node_timeout,
 ) inherits redis::params {
   anchor { 'redis::begin': }
   anchor { 'redis::end': }

manifests/params.pp

@@ -19,6 +19,7 @@
   $extra_config_file            = undef
   $hash_max_ziplist_entries     = 512
   $hash_max_ziplist_value       = 64
+  $hz                           = 10
   $list_max_ziplist_entries     = 512
   $list_max_ziplist_value       = 64
   $log_dir                      = '/var/log/redis'
@@ -51,6 +52,7 @@
   $sentinel_init_template       = 'redis/redis-sentinel.init.erb'
   $sentinel_pid_file            = '/var/run/redis/redis-sentinel.pid'
   $sentinel_notification_script = undef
+  $service_provider             = undef
   $set_max_intset_entries       = 512
   $slowlog_log_slower_than      = 10000
   $slowlog_max_len              = 1024
@@ -70,6 +72,11 @@
   $slave_serve_stale_data = true
   $slaveof                = undef
 
+  # redis.conf.erb - redis 3.0 clustering
+  $cluster_enabled        = false
+  $cluster_config_file    = 'nodes.conf'
+  $cluster_node_timeout   = 5000
+
   case $::osfamily {
     'Debian': {
       $config_dir                = '/etc/redis'

manifests/preinstall.pp

@@ -7,16 +7,16 @@
   if $::redis::manage_repo {
     case $::operatingsystem {
       'RedHat', 'CentOS', 'Scientific', 'OEL': {
-        if $::operatingsystemrelease < 7 {
-          $rpm_url = $::operatingsystemrelease ? {
-            /^5/    => "http://download.powerstack.org/5/${::architecture}/",
-            /^6/    => "http://download.powerstack.org/6/${::architecture}/",
+        if $::operatingsystemmajrelease < '7' {
+          $rpm_url = $::operatingsystemmajrelease ? {
+            '5'    => "http://download.powerstack.org/5/${::architecture}/",
+            '6'    => "http://download.powerstack.org/6/${::architecture}/",
             default => Fail['Operating system or release not supported.'],
           }
 
-          $rpm_gpgkey = $::operatingsystemrelease ? {
-            /^5/    => 'https://raw.githubusercontent.com/santisaez/powerstack/master/RPM-GPG-KEY-powerstack',
-            /^6/    => 'https://raw.githubusercontent.com/santisaez/powerstack/master/RPM-GPG-KEY-powerstack',
+          $rpm_gpgkey = $::operatingsystemmajrelease ? {
+            '5'    => 'https://raw.githubusercontent.com/santisaez/powerstack/master/RPM-GPG-KEY-powerstack',
+            '6'    => 'https://raw.githubusercontent.com/santisaez/powerstack/master/RPM-GPG-KEY-powerstack',
             default => Fail['Operating system or release not supported.'],
           }
 
@@ -29,19 +29,19 @@
           }
         }
 
-        if $::operatingsystemrelease == 7 {
+        if $::operatingsystemmajrelease == '7' {
           require ::epel
         }
       }
 
       'Amazon': {
-        $rpm_url = $::operatingsystemrelease ? {
-          /^3/    => "http://download.powerstack.org/6/${::architecture}/",
+        $rpm_url = $::operatingsystemmajrelease ? {
+          '3'    => "http://download.powerstack.org/6/${::architecture}/",
           default => Fail['Operating system or release version not supported.'],
         }
 
-        $rpm_gpgkey = $::operatingsystemrelease ? {
-          /^3/    => 'https://raw.githubusercontent.com/santisaez/powerstack/master/RPM-GPG-KEY-powerstack',
+        $rpm_gpgkey = $::operatingsystemmajrelease ? {
+          '3'    => 'https://raw.githubusercontent.com/santisaez/powerstack/master/RPM-GPG-KEY-powerstack',
           default => Fail['Operating system or release version not supported.'],
         }
 

manifests/service.pp

@@ -9,6 +9,7 @@
       enable     => $::redis::service_enable,
       hasrestart => $::redis::service_hasrestart,
       hasstatus  => $::redis::service_hasstatus,
+      provider   => $::redis::service_provider,
     }
   }
 }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "arioch-redis",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "author": "Tom De Vylder",
   "summary": "Redis module",
   "license": "Apache-2.0",
@@ -58,7 +58,9 @@
         "6.2",
         "6.3",
         "6.4",
-        "6.5"
+        "6.5",
+        "7.0",
+        "7.1"
       ]
     },
     {
@@ -69,7 +71,9 @@
         "6.2",
         "6.3",
         "6.4",
-        "6.5"
+        "6.5",
+        "7.0",
+        "7.1"
       ]
     }
   ]

spec/classes/redis_spec.rb

@@ -311,12 +311,24 @@
         {
           :osfamily => 'RedHat',
           :operatingsystem => 'RedHat',
-          :operatingsystemrelease => '6'
+          :operatingsystemmajrelease => '6'
         }
       }
 
       it { should create_yumrepo('powerstack').with_enabled(1) }
     end
+
+    context 'on RHEL 7' do
+      let (:facts) {
+        {
+          :osfamily => 'RedHat',
+          :operatingsystem => 'RedHat',
+          :operatingsystemmajrelease => '7'
+        }
+      }
+
+      it { should contain_class('epel') }
+    end
   end
 
   describe 'with parameter masterauth' do
@@ -450,6 +462,19 @@
     }
   end
 
+  describe 'with parameter hz' do
+    let (:params) {
+      {
+        :hz=> '_VALUE_'
+      }
+    }
+
+    it { should contain_file('/etc/redis/redis.conf').with(
+        'content' => /hz.*_VALUE_/
+      )
+    }
+  end
+
   describe 'with parameter rdbcompression' do
     let (:params) {
       {
@@ -752,5 +777,60 @@
       )
     }
   end
+
+  describe 'with parameter cluster_enabled-false' do
+    let (:params) {
+      {
+        :cluster_enabled => false
+      }
+    }
+
+    it { should contain_file('/etc/redis/redis.conf').with(
+        'content' => /cluster-enabled.*no/
+      )
+    }
+  end
+
+  describe 'with parameter cluster_enabled-true' do
+    let (:params) {
+      {
+        :cluster_enabled => true
+      }
+    }
+
+    it { should contain_file('/etc/redis/redis.conf').with(
+        'content' => /cluster-enabled.*yes/
+      )
+    }
+  end
+
+  describe 'with parameter cluster_config_file' do
+    let (:params) {
+      {
+        :cluster_enabled => true,
+        :cluster_config_file => '_VALUE_'
+      }
+    }
+
+    it { should contain_file('/etc/redis/redis.conf').with(
+        'content' => /cluster-config-file.*_VALUE_/
+      )
+    }
+  end
+
+  describe 'with parameter cluster_config_file' do
+    let (:params) {
+      {
+        :cluster_enabled => true,
+        :cluster_node_timeout => '_VALUE_'
+      }
+    }
+
+    it { should contain_file('/etc/redis/redis.conf').with(
+        'content' => /cluster-node-timeout.*_VALUE_/
+      )
+    }
+  end
+
 end