diff --git a/manifests/params.pp b/manifests/params.pp index 006a4e8b57..c63ac771fd 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -184,6 +184,8 @@ if $facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'], '8') >= 0 { # Jessie uses systemd $service_status = pick($service_status, "/usr/sbin/service ${service_name}@*-main status") + } elsif $facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '18.04') >= 0 { + $service_status = pick($service_status, "/usr/sbin/service ${service_name}@*-main status") } elsif $facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '15.04') >= 0 { # Ubuntu releases since vivid use systemd $service_status = pick($service_status, "/usr/sbin/service ${service_name} status") diff --git a/spec/unit/classes/server/service_spec.rb b/spec/unit/classes/server/service_spec.rb new file mode 100644 index 0000000000..ad81957c88 --- /dev/null +++ b/spec/unit/classes/server/service_spec.rb @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe 'postgresql::server::service', type: :class do + let :pre_condition do + 'include postgresql::server' + end + + let :facts do + { + os: { + family: 'Debian', + name: 'Ubuntu', + release: { 'full' => '18.04', 'major' => '18.04' }, + }, + } + end + + it { is_expected.to contain_class('postgresql::server::service') } + it { is_expected.to contain_service('postgresqld').with_name('postgresql').with_status('/usr/sbin/service postgresql@*-main status') } +end