Skip to content

Commit 8e040de

Browse files
authored
Merge pull request puppetlabs#1306 from makandra/11201_service_status_ubuntu
MODULES-11201: add service_name for Ubuntu 18.04 and later
2 parents fe44cec + 2f6ab27 commit 8e040de

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

manifests/params.pp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,8 @@
184184
if $facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'], '8') >= 0 {
185185
# Jessie uses systemd
186186
$service_status = pick($service_status, "/usr/sbin/service ${service_name}@*-main status")
187+
} elsif $facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '18.04') >= 0 {
188+
$service_status = pick($service_status, "/usr/sbin/service ${service_name}@*-main status")
187189
} elsif $facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '15.04') >= 0 {
188190
# Ubuntu releases since vivid use systemd
189191
$service_status = pick($service_status, "/usr/sbin/service ${service_name} status")
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# frozen_string_literal: true
2+
3+
require 'spec_helper'
4+
5+
describe 'postgresql::server::service', type: :class do
6+
let :pre_condition do
7+
'include postgresql::server'
8+
end
9+
10+
let :facts do
11+
{
12+
os: {
13+
family: 'Debian',
14+
name: 'Ubuntu',
15+
release: { 'full' => '18.04', 'major' => '18.04' },
16+
},
17+
}
18+
end
19+
20+
it { is_expected.to contain_class('postgresql::server::service') }
21+
it { is_expected.to contain_service('postgresqld').with_name('postgresql').with_status('/usr/sbin/service postgresql@*-main status') }
22+
end

0 commit comments

Comments
 (0)