]> gitweb.fluxo.info Git - puppet-dhcp.git/commitdiff
We do not need a special conf for squeeze/lenny
authorCédric Jeanneret <cedric.jeanneret@camptocamp.com>
Thu, 4 Nov 2010 13:12:39 +0000 (14:12 +0100)
committerCédric Jeanneret <cedric.jeanneret@camptocamp.com>
Thu, 4 Nov 2010 13:12:39 +0000 (14:12 +0100)
manifests/classes/dhcp-debian.pp
templates/dhcpd.conf.debian.erb [moved from templates/dhcpd.conf.squeeze.erb with 100% similarity]

index 1d35cbc020ee6e4cf8b9a4b770315ac93986c117..af8d5926ecc98ad23f09d235f7d458f64180c8ec 100644 (file)
@@ -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"] {