diff --git a/manifests/globals.pp b/manifests/globals.pp index 298439d8c9..d7b37650de 100644 --- a/manifests/globals.pp +++ b/manifests/globals.pp @@ -111,10 +111,10 @@ 'Suse' => $::operatingsystem ? { 'SLES' => $::operatingsystemrelease ? { /11\.[0-4]/ => '91', - default => '94', + default => '93', }, 'OpenSuSE' => $::operatingsystemrelease ? { - default => '94', + '13.2' => '93', }, default => undef, }, diff --git a/manifests/params.pp b/manifests/params.pp index 8b30728bda..b07f8f2930 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -278,13 +278,8 @@ $bindir = pick($bindir, "/usr/lib/postgresql${version}/bin") $datadir = pick($datadir, '/var/lib/pgsql/data') $confdir = pick($confdir, $datadir) - if $::operatingsystem == 'SLES' and versioncmp($::operatingsystemrelease, '11.4') <= 0 { - $service_status = pick($service_status, "/etc/init.d/${service_name} status") - $service_reload = "/etc/init.d/${service_name} reload" - } else { - $service_status = pick($service_status, "systemctl status ${service_name}") - $service_reload = "systemctl reload ${service_name}" - } + $service_status = pick($service_status, "/etc/init.d/${service_name} status") + $service_reload = "/etc/init.d/${service_name} reload" $psql_path = pick($psql_path, "${bindir}/psql") $needs_initdb = pick($needs_initdb, true)