From 4dbb5a09e23e56fc8ed7ff04fc1cfcdc17932786 Mon Sep 17 00:00:00 2001
From: Mickaël Canévet <mickael.canevet@camptocamp.com>
Date: Wed, 4 Nov 2015 11:11:53 +0100
Subject: Fix convergence on Debian 8

---
 .travis.yml                 |  6 ------
 manifests/server/service.pp | 15 +++++++++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 43ab8d1..ff4dc90 100644
--- 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 ef016c5..031a603 100644
--- 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,
   }
 }
-- 
cgit v1.2.3