We do not need a special conf for squeeze/lenny

diff --git a/manifests/classes/dhcp-debian.pp b/manifests/classes/dhcp-debian.pp
index 1d35cbc020ee6e4cf8b9a4b770315ac93986c117..af8d5926ecc98ad23f09d235f7d458f64180c8ec 100644 (file)
--- 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
similarity index 100%
rename from templates/dhcpd.conf.squeeze.erb
rename to templates/dhcpd.conf.debian.erb