Fix convergence on Debian 8

diff --git a/.travis.yml b/.travis.yml
index 43ab8d191609cf1e624f7588b27707c49fdb3c62..ff4dc902e58ac76ec093c0b57c011461fe7fc844 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,12 +39,6 @@ matrix:
     env: BEAKER_set="debian-8-x86_64-docker"
     bundler_args:
     script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
-  - rvm: default
-    sudo: required
-    services: docker
-    env: BEAKER_set="ubuntu-12.04-x86_64-docker"
-    bundler_args:
-    script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
   - rvm: default
     sudo: required
     services: docker

diff --git a/manifests/server/service.pp b/manifests/server/service.pp
index ef016c531c489c1b08f1854408c7b87949564b7e..031a6030a90f9a01fde4a5aab563534c5ea562a1 100644 (file)
--- a/manifests/server/service.pp
+++ b/manifests/server/service.pp
@@ -10,10 +10,17 @@ class dhcp::server::service {
   validate_string($dhcp::params::service_pattern)
   validate_re($dhcp::params::service_pattern, '^\S+$')
 
+  if $::operatingsystem == 'Debian' and $::operatingsystemmajrelease == '8' {
+    $provider = 'debian'
+  } else {
+    $provider = undef
+  }
+
   service {'dhcpd':
-    ensure  => running,
-    name    => $dhcp::params::srv_dhcpd,
-    enable  => true,
-    pattern => $dhcp::params::service_pattern,
+    ensure   => running,
+    provider => $provider,
+    name     => $dhcp::params::srv_dhcpd,
+    enable   => true,
+    pattern  => $dhcp::params::service_pattern,
   }
 }