diff options
| author | Cédric Jeanneret <cedric.jeanneret@camptocamp.com> | 2010-11-04 14:12:39 +0100 |
|---|---|---|
| committer | Cédric Jeanneret <cedric.jeanneret@camptocamp.com> | 2010-11-04 14:12:39 +0100 |
| commit | bff43add032deea4b335836ef105958a7e7d6659 (patch) | |
| tree | c00593576616efa505a84ae0371a91e9835a3004 | |
| parent | 68b0642c21a598b6f5aecfedd38cc1584737fbec (diff) | |
| download | puppet-dhcp-bff43add032deea4b335836ef105958a7e7d6659.tar.gz puppet-dhcp-bff43add032deea4b335836ef105958a7e7d6659.tar.bz2 | |
We do not need a special conf for squeeze/lenny
| -rw-r--r-- | manifests/classes/dhcp-debian.pp | 5 | ||||
| -rw-r--r-- | templates/dhcpd.conf.debian.erb (renamed from templates/dhcpd.conf.squeeze.erb) | 0 |
2 files changed, 1 insertions, 4 deletions
diff --git a/manifests/classes/dhcp-debian.pp b/manifests/classes/dhcp-debian.pp index 1d35cbc..af8d592 100644 --- a/manifests/classes/dhcp-debian.pp +++ b/manifests/classes/dhcp-debian.pp @@ -9,10 +9,7 @@ This class should not be included as is, please include "dhcp" instead. class dhcp::debian inherits dhcp::base { Common::Concatfilepart["00-base"] { - content => $lsbdistcodename ? { - squeeze => template('dhcp/dhcpd.conf.squeeze.erb'), - lenny => template('dhcp/dhcpd.conf.lenny.erb'), - } + content => template('dhcp/dhcpd.conf.squeeze.erb'), } Service["dhcpd"] { diff --git a/templates/dhcpd.conf.squeeze.erb b/templates/dhcpd.conf.debian.erb index 865c04c..865c04c 100644 --- a/templates/dhcpd.conf.squeeze.erb +++ b/templates/dhcpd.conf.debian.erb |