Skip to content

Commit b0bdc0d

Browse files
add serivce_name for Ubuntu 18.04 and later
1 parent 0a2cb69 commit b0bdc0d

File tree

2 files changed

+35
-0
lines changed

2 files changed

+35
-0
lines changed

manifests/params.pp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,8 @@
206206
if $facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'], '8') >= 0 {
207207
# Jessie uses systemd
208208
$service_status = pick($service_status, "/usr/sbin/service ${service_name}@*-main status")
209+
} elsif $facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '18.04') >= 0 {
210+
$service_status = pick($service_status, "/usr/sbin/service ${service_name}@*-main status")
209211
} elsif $facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '15.04') >= 0 {
210212
# Ubuntu releases since vivid use systemd
211213
$service_status = pick($service_status, "/usr/sbin/service ${service_name} status")
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
2+
# frozen_string_literal: true
3+
4+
require 'spec_helper'
5+
6+
describe 'postgresql::server::service', type: :class do
7+
8+
let :pre_condition do
9+
'include postgresql::server'
10+
end
11+
12+
let :node_params do
13+
{
14+
'lsbmajdistrelease' => '18.04',
15+
}
16+
end
17+
18+
let :facts do
19+
{
20+
os: {
21+
family: 'Debian',
22+
name: 'Ubuntu',
23+
release: { 'full' => '18.04', 'major' => '18.04' },
24+
},
25+
}
26+
end
27+
28+
it {
29+
is_expected.to contain_class('postgresql::server::service')
30+
is_expected.to contain_service('postgresqld').with_name('postgresql')
31+
is_expected.to contain_service('postgresqld').with_status('/usr/sbin/service postgresql@*-main status')
32+
}
33+
end

0 commit comments

Comments
 (0)