From c0acadb5c17b4c7597bce1f8532f44b407d20f22 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Sat, 6 Oct 2018 13:17:07 +0200 Subject: [PATCH 1/2] Remove service provider detection We should be able to rely on Puppet setting the correct defaults. --- manifests/params.pp | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index b0ad0fd62..5d1d4e60e 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -171,27 +171,4 @@ fail("Osfamily ${::osfamily} and ${::operatingsystem} is not supported") } } - - case $::operatingsystem { - 'Debian': { - case $::operatingsystemmajrelease { - '8': { - $service_provider = pick($service_provider, 'systemd') - } - default: { - $service_provider = pick($service_provider, 'debian') - } - } - } - 'Ubuntu': { - if versioncmp($::operatingsystemmajrelease, '16') >= 0 { - $service_provider = pick($service_provider, 'systemd') - } else { - $service_provider = pick($service_provider, 'upstart') - } - } - default: { - $service_provider = undef - } - } } From 88f239f003bc498eb1af9f38cb804f5da2c86a01 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Sat, 6 Oct 2018 14:01:25 +0200 Subject: [PATCH 2/2] Move to Debian 9 and Ubuntu 16.04/18.04 --- metadata.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/metadata.json b/metadata.json index 94ca7e364..cc68866bf 100644 --- a/metadata.json +++ b/metadata.json @@ -23,14 +23,14 @@ { "operatingsystem": "Debian", "operatingsystemrelease": [ - "8" + "9" ] }, { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ - "14.04", - "16.04" + "16.04", + "18.04" ] } ],