Disable gpximport, statistics and cleanup roles on spike-04

[chef.git] / cookbooks / dhcpd / templates / default / dhcpd.conf.erb

diff --git a/cookbooks/dhcpd/templates/default/dhcpd.conf.erb b/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
index 572a19ac7a70c3aae3bb25ad1090af1b57614da4..0e4c9653fb8eea3eef73e7dbb26aa742d27ce190 100644 (file)
--- a/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
+++ b/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
@@ -63,7 +63,7 @@ host errol.oob.openstreetmap.org {
 }
 
 host eustace.oob.openstreetmap.org {
 }
 
 host eustace.oob.openstreetmap.org {

-  hardware ethernet 00:17:a4:3c:fb:9c;
+  hardware ethernet 1c:c1:de:71:4d:2e;

   server-name "eustace.oob.openstreetmap.org";
   fixed-address eustace.oob.openstreetmap.org;
 }
   server-name "eustace.oob.openstreetmap.org";
   fixed-address eustace.oob.openstreetmap.org;
 }


@@ -81,7 +81,7 @@ host fiddlestick.oob.openstreetmap.org {
 }
 
 host grindtooth.oob.openstreetmap.org {
 }
 
 host grindtooth.oob.openstreetmap.org {

-  hardware ethernet 00:1b:78:04:37:de;
+  hardware ethernet 00:25:b3:a7:b7:9e;

   server-name "grindtooth.oob.openstreetmap.org";
   fixed-address grindtooth.oob.openstreetmap.org;
 }
   server-name "grindtooth.oob.openstreetmap.org";
   fixed-address grindtooth.oob.openstreetmap.org;
 }


@@ -123,7 +123,7 @@ host pummelzacken.oob.openstreetmap.org {
 }
 
 host ridley.oob.openstreetmap.org {
 }
 
 host ridley.oob.openstreetmap.org {

-  hardware ethernet 00:17:a4:39:99:54;
+  hardware ethernet d4:85:64:52:2d:d8;

   server-name "ridley.oob.openstreetmap.org";
   fixed-address ridley.oob.openstreetmap.org;
 }
   server-name "ridley.oob.openstreetmap.org";
   fixed-address ridley.oob.openstreetmap.org;
 }


@@ -183,7 +183,7 @@ host thorn-03.oob.openstreetmap.org {
 }
 
 host urmel.oob.openstreetmap.org {
 }
 
 host urmel.oob.openstreetmap.org {

-  hardware ethernet 00:19:bb:39:1b:e6;
+  hardware ethernet 1c:c1:de:e7:4d:b2;

   server-name "urmel.oob.openstreetmap.org";
   fixed-address urmel.oob.openstreetmap.org;
 }
   server-name "urmel.oob.openstreetmap.org";
   fixed-address urmel.oob.openstreetmap.org;
 }