Showing with 32 additions and 45 deletions.
  1. +1 −1 Modulefile
  2. +18 −18 manifests/params.pp
  3. +12 −12 manifests/preinstall.pp
  4. +1 −14 spec/classes/redis_spec.rb
2 changes: 1 addition & 1 deletion Modulefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name 'arioch-redis'
version '0.0.3'
version '0.0.4'
author 'Tom De Vylder'
license 'Apache License, Version 2.0'
summary 'Redis module'
Expand Down
36 changes: 18 additions & 18 deletions manifests/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,42 +11,42 @@
$appendfsync = 'everysec'
$appendonly = false
$auto_aof_rewrite_min_size = '64min'
$auto_aof_rewrite_percentage = '100'
$auto_aof_rewrite_percentage = 100
$bind = '127.0.0.1'
$daemonize = true
$databases = '16'
$databases = 16
$dbfilename = 'dump.rdb'
$hash_max_ziplist_entries = '512'
$hash_max_ziplist_value = '64'
$list_max_ziplist_entries = '512'
$list_max_ziplist_value = '64'
$hash_max_ziplist_entries = 512
$hash_max_ziplist_value = 64
$list_max_ziplist_entries = 512
$list_max_ziplist_value = 64
$log_dir = '/var/log/redis'
$log_file = '/var/log/redis/redis.log'
$log_level = 'notice'
$maxclients = '10000'
$maxclients = 10000
$maxmemory = undef
$maxmemory_policy = undef
$maxmemory_samples = undef
$no_appendfsync_on_rewrite = false
$pid_file = '/var/run/redis/redis-server.pid'
$port = '6379'
$port = 6379
$rdbcompression = true
$requirepass = undef
$set_max_intset_entries = '512'
$slowlog_log_slower_than = '10000'
$slowlog_max_len = '1024'
$timeout = '0'
$set_max_intset_entries = 512
$slowlog_log_slower_than = 10000
$slowlog_max_len = 1024
$timeout = 0
$workdir = '/var/lib/redis/'
$zset_max_ziplist_entries = '128'
$zset_max_ziplist_value = '64'
$zset_max_ziplist_entries = 128
$zset_max_ziplist_value = 64

# redis.conf.erb - replication
$masterauth = undef
$repl_ping_slave_period = '10'
$repl_timeout = '60'
$repl_ping_slave_period = 10
$repl_timeout = 60
$slave_read_only = true
$slave_serve_stale_data = true
$slaveof = undef
$slave_read_only = true

case $::osfamily {
'Debian': {
Expand All @@ -70,7 +70,7 @@
'RedHat': {
$config_dir = '/etc/redis'
$config_dir_mode = '0755'
$config_file = '/etc/redis/redis.conf'
$config_file = '/etc/redis.conf'
$config_file_mode = '0644'
$config_group = 'root'
$config_owner = 'root'
Expand Down
24 changes: 12 additions & 12 deletions manifests/preinstall.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,24 @@
if $::redis::manage_repo {
case $::operatingsystem {
'RedHat', 'CentOS', 'Scientific', 'OEL', 'Amazon': {
$epel_mirror = $::operatingsystemrelease ? {
/^5/ => 'https://mirrors.fedoraproject.org/metalink?repo=epel-5&arch=$basearch',
/^6/ => 'https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch',
$rpm_url = $::operatingsystemrelease ? {
/^5/ => "http://download.powerstack.org/5/${::architecture}/",
/^6/ => "http://download.powerstack.org/6/${::architecture}/",
default => Fail['Operating system or release version not supported.'],
}

$epel_gpgkey = $::operatingsystemrelease ? {
/^5/ => 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-5',
/^6/ => 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6',
$rpm_gpgkey = $::operatingsystemrelease ? {
/^5/ => 'https://raw.github.com/santisaez/powerstack/master/RPM-GPG-KEY-powerstack',
/^6/ => 'https://raw.github.com/santisaez/powerstack/master/RPM-GPG-KEY-powerstack',
default => Fail['Operating system or release version not supported.'],
}

yumrepo { 'epel':
descr => 'Extra Packages for Enterprise Linux',
mirrorlist => $epel_mirror,
gpgkey => $epel_gpgkey,
enabled => 1,
gpgcheck => 1;
yumrepo { 'powerstack':
descr => 'PowerStack for CentOS',
baseurl => $rpm_url,
gpgkey => $rpm_gpgkey,
enabled => 1,
gpgcheck => 1;
}
}

Expand Down
15 changes: 1 addition & 14 deletions spec/classes/redis_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@
}
}

it { should create_yumrepo('epel').with_enabled(1) }
it { should create_yumrepo('powerstack').with_enabled(1) }
end
end

Expand Down Expand Up @@ -552,19 +552,6 @@
}
end

# describe 'with parameter slaveof' do
# let (:params) {
# {
# :slaveof => '_VALUE_'
# }
# }
#
# it { should contain_file('/etc/redis/redis.conf').with(
# 'content' => /slaveof.*_VALUE_/
# )
# }
# end

describe 'with parameter: slaveof' do
context 'binding to localhost' do
let (:params) { { :slaveof => '_VALUE_' } }
Expand Down