diff options
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | 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 @@ -42,12 +42,6 @@ matrix: - 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 env: BEAKER_set="ubuntu-14.04-x86_64-docker" bundler_args: script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb 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, } } |