Skip to content

Commit

Permalink
Fix manage_service_file variable
Browse files Browse the repository at this point in the history 
Fixes voxpupuli#308
Fixes voxpupuli#310

The manage_service_file is configured incorrectly and doesn't
allow for overriding the value with hieradata.  Updaing the init.pp
class params allows the file to be passed in.

The filename for the systemd default service was incorrectly set
as the variable is undefined.

As a part of adding the specs for manage_service_file I've added
a helper function that I was able to apply to existing tests.
  • Loading branch information
@CallumBanbery
CallumBanbery committed May 9, 2019
1 parent 16a52af commit a8a1f54
Show file tree
Hide file tree
Showing 5 changed files with 120 additions and 50 deletions.
11 changes: 6 additions & 5 deletions manifests/instance.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,16 +211,17 @@
# Defaults for redis::instance
$manage_service_file = true,
Optional[Stdlib::Absolutepath] $log_file = undef,
$pid_file = "/var/run/redis/redis-server-${name}.pid",
$unixsocket = "/var/run/redis/redis-server-${name}.sock",
Stdlib::Absolutepath $workdir = "${::redis::workdir}/redis-server-${name}",
$pid_file = "/var/run/redis/${::redis::service_name}-${name}.pid",
$unixsocket = "/var/run/redis/${::redis::service_name}-${name}.sock",
Stdlib::Absolutepath $workdir = "${::redis::workdir}/${::redis::service_name}-${name}",
) {

if $title == 'default' {
$redis_server_name = $::redis::service_name
$redis_file_name_orig = $config_file_orig
$redis_file_name = $config_file
} else {
$redis_server_name = "redis-server-${name}"
$redis_server_name = "${::redis::service_name}-${name}"
$redis_file_name_orig = sprintf('%s/%s.%s', dirname($config_file_orig), $redis_server_name, 'conf.puppet')
$redis_file_name = sprintf('%s/%s.%s', dirname($config_file), $redis_server_name, 'conf')
}
Expand All @@ -235,7 +236,7 @@
}

$_real_log_file = $log_file ? {
undef => "${log_dir}/redis-server-${name}.log",
undef => "${log_dir}/${::redis::service_name}-${name}.log",
default => $log_file,
}

Expand Down
8 changes: 4 additions & 4 deletions spec/acceptance/suites/default/redis_multi_instances_one_host_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,19 @@ class { '::redis':
it { is_expected.to be_installed }
end

describe service('redis-server-redis1') do
describe service("#{manifest_vars[:service_name]}-redis1") do
it { is_expected.to be_running }
end

describe service('redis-server-redis2') do
describe service("#{manifest_vars[:service_name]}-redis2") do
it { is_expected.to be_running }
end

describe file("#{config_path}/redis-server-redis1.conf") do
describe file("#{config_path}/#{manifest_vars[:service_name]}-redis1.conf") do
its(:content) { is_expected.to match %r{port 7777} }
end

describe file("#{config_path}/redis-server-redis2.conf") do
describe file("#{config_path}/#{manifest_vars[:service_name]}-redis2.conf") do
its(:content) { is_expected.to match %r{port 8888} }
end

Expand Down
34 changes: 33 additions & 1 deletion spec/classes/redis_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
require 'spec_helper'

describe 'redis', type: :class do
let(:service_file) { redis_service_file(service_provider: facts[:service_provider]) }

on_supported_os.each do |os, facts|
context "on #{os}" do
let(:facts) do
facts.merge(redis_server_version: '3.2.3')
merged_facts = facts.merge(redis_server_version: '3.2.3')

if facts[:operatingsystem].casecmp('archlinux') == 0
merged_facts = merged_facts.merge(service_provider: 'systemd')
end

merged_facts
end

let(:package_name) { manifest_vars[:package_name] }
Expand Down Expand Up @@ -1191,6 +1199,30 @@
)
}
end

describe 'with parameter manage_service_file' do
let(:params) do
{
manage_service_file: true
}
end

it {
is_expected.to contain_file(service_file)
}
end

describe 'with parameter manage_service_file' do
let(:params) do
{
manage_service_file: false
}
end

it {
is_expected.not_to contain_file(service_file)
}
end
end
end
end
94 changes: 60 additions & 34 deletions spec/defines/instance_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
let :title do
'app2'
end
let(:service_name) { redis_service_name(service_name: title) }
let(:service_file) { redis_service_file(service_name: service_name, service_provider: facts[:service_provider]) }

describe 'os-dependent items' do
context 'on Ubuntu systems' do
Expand All @@ -17,29 +19,41 @@
ubuntu_1404_facts
end

it { is_expected.to contain_file('/etc/redis/redis-server-app2.conf.puppet').with('content' => %r{^bind 127.0.0.1}) }
it { is_expected.to contain_file('/etc/redis/redis-server-app2.conf.puppet').with('content' => %r{^logfile /var/log/redis/redis-server-app2\.log}) }
it { is_expected.to contain_file('/etc/redis/redis-server-app2.conf.puppet').with('content' => %r{^dir /var/lib/redis/redis-server-app2}) }
it { is_expected.to contain_file('/etc/redis/redis-server-app2.conf.puppet').with('content' => %r{^unixsocket /var/run/redis/redis-server-app2\.sock}) }
it { is_expected.to contain_file('/var/lib/redis/redis-server-app2') }
it { is_expected.to contain_service('redis-server-app2').with_ensure('running') }
it { is_expected.to contain_service('redis-server-app2').with_enable('true') }
it { is_expected.to contain_file('/etc/init.d/redis-server-app2').with_content(%r{DAEMON_ARGS=/etc/redis/redis-server-app2\.conf}) }
it { is_expected.to contain_file('/etc/init.d/redis-server-app2').with_content(%r{PIDFILE=/var/run/redis/redis-server-app2\.pid}) }
it { is_expected.to contain_file("/etc/redis/#{service_name}.conf.puppet").with('content' => %r{^bind 127.0.0.1}) }
it { is_expected.to contain_file("/etc/redis/#{service_name}.conf.puppet").with('content' => %r{^logfile /var/log/redis/#{service_name}\.log}) }
it { is_expected.to contain_file("/etc/redis/#{service_name}.conf.puppet").with('content' => %r{^dir /var/lib/redis/#{service_name}}) }
it { is_expected.to contain_file("/etc/redis/#{service_name}.conf.puppet").with('content' => %r{^unixsocket /var/run/redis/#{service_name}\.sock}) }
it { is_expected.to contain_file("/var/lib/redis/#{service_name}") }
it { is_expected.to contain_service(service_name).with_ensure('running') }
it { is_expected.to contain_service(service_name).with_enable('true') }
it { is_expected.to contain_file(service_file).with_content(%r{DAEMON_ARGS=/etc/redis/#{service_name}\.conf}) }
it { is_expected.to contain_file(service_file).with_content(%r{PIDFILE=/var/run/redis/#{service_name}\.pid}) }

context 'with default title' do
let(:title) { 'default' }

it { is_expected.to contain_file(service_file).with_content(%r{DAEMON_ARGS=#{manifest_vars[:config_file]}}) }
end
end
context '16.04' do
let(:facts) do
ubuntu_1604_facts.merge(service_provider: 'systemd')
end

it { is_expected.to contain_file('/etc/redis/redis-server-app2.conf.puppet').with('content' => %r{^bind 127.0.0.1}) }
it { is_expected.to contain_file('/etc/redis/redis-server-app2.conf.puppet').with('content' => %r{^logfile /var/log/redis/redis-server-app2\.log}) }
it { is_expected.to contain_file('/etc/redis/redis-server-app2.conf.puppet').with('content' => %r{^dir /var/lib/redis/redis-server-app2}) }
it { is_expected.to contain_file('/etc/redis/redis-server-app2.conf.puppet').with('content' => %r{^unixsocket /var/run/redis/redis-server-app2\.sock}) }
it { is_expected.to contain_file('/var/lib/redis/redis-server-app2') }
it { is_expected.to contain_service('redis-server-app2').with_ensure('running') }
it { is_expected.to contain_service('redis-server-app2').with_enable('true') }
it { is_expected.to contain_file('/etc/systemd/system/redis-server-app2.service').with_content(%r{ExecStart=/usr/bin/redis-server /etc/redis/redis-server-app2\.conf}) }
it { is_expected.to contain_file("/etc/redis/#{service_name}.conf.puppet").with('content' => %r{^bind 127.0.0.1}) }
it { is_expected.to contain_file("/etc/redis/#{service_name}.conf.puppet").with('content' => %r{^logfile /var/log/redis/#{service_name}\.log}) }
it { is_expected.to contain_file("/etc/redis/#{service_name}.conf.puppet").with('content' => %r{^dir /var/lib/redis/#{service_name}}) }
it { is_expected.to contain_file("/etc/redis/#{service_name}.conf.puppet").with('content' => %r{^unixsocket /var/run/redis/#{service_name}\.sock}) }
it { is_expected.to contain_file("/var/lib/redis/#{service_name}") }
it { is_expected.to contain_service(service_name).with_ensure('running') }
it { is_expected.to contain_service(service_name).with_enable('true') }
it { is_expected.to contain_file(service_file).with_content(%r{ExecStart=/usr/bin/redis-server /etc/redis/#{service_name}\.conf}) }

context 'with default title' do
let(:title) { 'default' }

it { is_expected.to contain_file(service_file).with_content(%r{ExecStart=/usr/bin/redis-server #{manifest_vars[:config_file]}}) }
end
end
end
context 'on CentOS systems' do
Expand All @@ -48,29 +62,41 @@
centos_6_facts
end

it { is_expected.to contain_file('/etc/redis-server-app2.conf.puppet').with('content' => %r{^bind 127.0.0.1}) }
it { is_expected.to contain_file('/etc/redis-server-app2.conf.puppet').with('content' => %r{^logfile /var/log/redis/redis-server-app2\.log}) }
it { is_expected.to contain_file('/etc/redis-server-app2.conf.puppet').with('content' => %r{^dir /var/lib/redis/redis-server-app2}) }
it { is_expected.to contain_file('/etc/redis-server-app2.conf.puppet').with('content' => %r{^unixsocket /var/run/redis/redis-server-app2\.sock}) }
it { is_expected.to contain_file('/var/lib/redis/redis-server-app2') }
it { is_expected.to contain_service('redis-server-app2').with_ensure('running') }
it { is_expected.to contain_service('redis-server-app2').with_enable('true') }
it { is_expected.to contain_file('/etc/init.d/redis-server-app2').with_content(%r{REDIS_CONFIG="/etc/redis-server-app2\.conf"}) }
it { is_expected.to contain_file('/etc/init.d/redis-server-app2').with_content(%r{pidfile="/var/run/redis/redis-server-app2\.pid"}) }
it { is_expected.to contain_file("/etc/#{service_name}.conf.puppet").with('content' => %r{^bind 127.0.0.1}) }
it { is_expected.to contain_file("/etc/#{service_name}.conf.puppet").with('content' => %r{^logfile /var/log/redis/#{service_name}\.log}) }
it { is_expected.to contain_file("/etc/#{service_name}.conf.puppet").with('content' => %r{^dir /var/lib/redis/#{service_name}}) }
it { is_expected.to contain_file("/etc/#{service_name}.conf.puppet").with('content' => %r{^unixsocket /var/run/redis/#{service_name}\.sock}) }
it { is_expected.to contain_file("/var/lib/redis/#{service_name}") }
it { is_expected.to contain_service(service_name).with_ensure('running') }
it { is_expected.to contain_service(service_name).with_enable('true') }
it { is_expected.to contain_file(service_file).with_content(%r{REDIS_CONFIG="/etc/#{service_name}\.conf"}) }
it { is_expected.to contain_file(service_file).with_content(%r{pidfile="/var/run/redis/redis-server-#{title}\.pid"}) }

context 'with default title' do
let(:title) { 'default' }

it { is_expected.to contain_file(service_file).with_content(%r{REDIS_CONFIG="#{manifest_vars[:config_file]}"}) }
end
end
context '7' do
let(:facts) do
centos_7_facts.merge(service_provider: 'systemd')
end

it { is_expected.to contain_file('/etc/redis-server-app2.conf.puppet').with('content' => %r{^bind 127.0.0.1}) }
it { is_expected.to contain_file('/etc/redis-server-app2.conf.puppet').with('content' => %r{^logfile /var/log/redis/redis-server-app2\.log}) }
it { is_expected.to contain_file('/etc/redis-server-app2.conf.puppet').with('content' => %r{^dir /var/lib/redis/redis-server-app2}) }
it { is_expected.to contain_file('/etc/redis-server-app2.conf.puppet').with('content' => %r{^unixsocket /var/run/redis/redis-server-app2\.sock}) }
it { is_expected.to contain_file('/var/lib/redis/redis-server-app2') }
it { is_expected.to contain_service('redis-server-app2').with_ensure('running') }
it { is_expected.to contain_service('redis-server-app2').with_enable('true') }
it { is_expected.to contain_file('/etc/systemd/system/redis-server-app2.service').with_content(%r{ExecStart=/usr/bin/redis-server /etc/redis-server-app2\.conf}) }
it { is_expected.to contain_file("/etc/#{service_name}.conf.puppet").with('content' => %r{^bind 127.0.0.1}) }
it { is_expected.to contain_file("/etc/#{service_name}.conf.puppet").with('content' => %r{^logfile /var/log/redis/#{service_name}\.log}) }
it { is_expected.to contain_file("/etc/#{service_name}.conf.puppet").with('content' => %r{^dir /var/lib/redis/#{service_name}}) }
it { is_expected.to contain_file("/etc/#{service_name}.conf.puppet").with('content' => %r{^unixsocket /var/run/redis/#{service_name}\.sock}) }
it { is_expected.to contain_file("/var/lib/redis/#{service_name}") }
it { is_expected.to contain_service(service_name).with_ensure('running') }
it { is_expected.to contain_service(service_name).with_enable('true') }
it { is_expected.to contain_file(service_file).with_content(%r{ExecStart=/usr/bin/redis-server /etc/#{service_name}\.conf}) }

context 'with default title' do
let(:title) { 'default' }

it { is_expected.to contain_file(service_file).with_content(%r{ExecStart=/usr/bin/redis-server #{manifest_vars[:config_file]}}) }
end
end
end
end
Expand Down
23 changes: 17 additions & 6 deletions spec/spec_helper.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ def manifest_vars
when 'RedHat'
vars[:package_name] = 'redis'
vars[:service_name] = 'redis'
vars[:config_file] = '/etc/redis.conf'
vars[:config_file_orig] = '/etc/redis.conf.puppet'
vars[:ppa_repo] = nil
when 'FreeBSD',
Expand All @@ -76,12 +77,22 @@ def manifest_vars
vars
end

def centos_facts
{
operatingsystem: 'CentOS',
osfamily: 'RedHat',
puppetversion: '4.5.2'
}
def redis_service_name(service_name: 'default')
case service_name.to_s
when 'default'
manifest_vars[:service_name]
else
"#{manifest_vars[:service_name]}-#{service_name}"
end
end

def redis_service_file(service_name: redis_service_name, service_provider: nil)
case service_provider.to_s
when 'systemd'
"/etc/systemd/system/#{service_name}.service"
else
"/etc/init.d/#{service_name}"
end
end

def debian_facts
Expand Down

0 comments on commit a8a1f54

Please sign in to comment.