Merge pull request #494 from ekohl/remove-service-detection

Move to Debian 9 and Ubuntu 16.04/18.04
voxpupuli · Oct 14, 2018 · ea3feb2 · ea3feb2
2 parents 9c0ef87 + 88f239f
commit ea3feb2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 26 deletions.
diff --git 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
-    }
-  }
 }
diff --git 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"
       ]
     }
   ],