diff options
| author | Mickaël Canévet <mickael.canevet@camptocamp.com> | 2015-11-04 11:24:25 +0100 |
|---|---|---|
| committer | Mickaël Canévet <mickael.canevet@camptocamp.com> | 2015-11-04 11:24:25 +0100 |
| commit | b5ee63a48adbea3e50300e2c0c26c575ec1b5abb (patch) | |
| tree | b5d4822f3c9c048064ab2f20cd70899aba0c16d1 /manifests | |
| parent | 3a974fea4562a9f2afc446b20ddc3fd221e4f8ed (diff) | |
| parent | 4dbb5a09e23e56fc8ed7ff04fc1cfcdc17932786 (diff) | |
| download | puppet-dhcp-b5ee63a48adbea3e50300e2c0c26c575ec1b5abb.tar.gz puppet-dhcp-b5ee63a48adbea3e50300e2c0c26c575ec1b5abb.tar.bz2 | |
Merge pull request #16 from mcanevet/feature/acceptance
Add acceptance tests
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/server/service.pp | 15 | ||||
| -rw-r--r-- | manifests/subnet.pp | 2 |
2 files changed, 13 insertions, 4 deletions
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, } } diff --git a/manifests/subnet.pp b/manifests/subnet.pp index e7c72dd..1f069af 100644 --- a/manifests/subnet.pp +++ b/manifests/subnet.pp @@ -34,6 +34,8 @@ define dhcp::subnet( $is_shared = false ) { + Dhcp::Subnet[$title] ~> Class['dhcp::server::service'] + include ::dhcp::params $ip_re = '^([1-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3}$' |