Merge commit '77e9695dace417d550bdcce75fe2a0dd860c239b'

[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 34988e62626fda1868805eb6afd9c3712be6990a..81ffb748af2ede30dcaf3a74bea6e56f11dc9005 100644 (file)
--- a/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
+++ b/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
@@ -14,38 +14,20 @@ subnet <%= interface[:network] %> netmask <%= interface[:netmask] %> {
 }
 <% end -%>
 
-host apc1.<%= @domain %> {
-  hardware ethernet 00:c0:b7:77:f3:d8;
-  server-name "apc1.<%= @domain %>";
-  fixed-address apc1.<%= @domain %>;
+host pdu1.ams.openstreetmap.org {
+  hardware ethernet 00:c0:b7:e3:e8:f2;
+  server-name "pdu1.ams.openstreetmap.org";
+  fixed-address pdu1.ams.openstreetmap.org;
 }
 
-host apc2.<%= @domain %> {
-  hardware ethernet 00:c0:b7:52:b7:d2;
-  server-name "apc2.<%= @domain %>";
-  fixed-address apc2.<%= @domain %>;
-}
-
-host apc3.<%= @domain %> {
-  hardware ethernet 00:c0:b7:52:b9:1e;
-  server-name "apc3.<%= @domain %>";
-  fixed-address apc3.<%= @domain %>;
-}
-
-host ascalon.oob.openstreetmap.org {
-  hardware ethernet 00:19:bb:39:3c:64;
-  server-name "ascalon.oob.openstreetmap.org";
-  fixed-address ascalon.oob.openstreetmap.org;
-}
-
-host bowser.oob.openstreetmap.org {
-  hardware ethernet 00:16:35:c5:dd:9e;
-  server-name "bowser.oob.openstreetmap.org";
-  fixed-address bowser.oob.openstreetmap.org;
+host pdu2.ams.openstreetmap.org {
+  hardware ethernet 00:c0:b7:e3:1b:9a;
+  server-name "pdu2.ams.openstreetmap.org";
+  fixed-address pdu2.ams.openstreetmap.org;
 }
 
 host clifford.oob.openstreetmap.org {
-  hardware ethernet 00:1a:4b:a5:bd:2a;
+  hardware ethernet 1c:c1:de:78:20:d6;
   server-name "clifford.oob.openstreetmap.org";
   fixed-address clifford.oob.openstreetmap.org;
 }
@@ -56,6 +38,18 @@ host draco.oob.openstreetmap.org {
   fixed-address draco.oob.openstreetmap.org;
 }
 
+host dulcy.oob.openstreetmap.org {
+  hardware ethernet 0c:c4:7a:66:ce:95;
+  server-name "dulcy.oob.openstreetmap.org";
+  fixed-address dulcy.oob.openstreetmap.org;
+}
+
+host eddie.oob.openstreetmap.org {
+  hardware ethernet 0c:c4:7a:d5:8c:c0;
+  server-name "eddie.oob.openstreetmap.org";
+  fixed-address eddie.oob.openstreetmap.org;
+}
+
 host errol.oob.openstreetmap.org {
   hardware ethernet 00:e0:81:c0:8d:01;
   server-name "errol.oob.openstreetmap.org";
@@ -63,33 +57,27 @@ host errol.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;
 }
 
-host faffy.oob.openstreetmap.org {
-  hardware ethernet 00:17:a4:37:cc:d0;
-  server-name "faffy.oob.openstreetmap.org";
-  fixed-address faffy.oob.openstreetmap.org;
-}
-
-host fiddlestick.oob.openstreetmap.org {
-  hardware ethernet 00:17:a4:0f:22:c6;
-  server-name "fiddlestick.oob.openstreetmap.org";
-  fixed-address fiddlestick.oob.openstreetmap.org;
+host grindtooth.oob.openstreetmap.org {
+  hardware ethernet 00:25:b3:a7:b7:9e;
+  server-name "grindtooth.oob.openstreetmap.org";
+  fixed-address grindtooth.oob.openstreetmap.org;
 }
 
-host horntail.oob.openstreetmap.org {
-  hardware ethernet 00:e0:81:46:95:6e;
-  server-name "horntail.oob.openstreetmap.org";
-  fixed-address horntail.oob.openstreetmap.org;
+host ironbelly.oob.openstreetmap.org {
+  hardware ethernet 00:25:90:cd:14:84;
+  server-name "ironbelly.oob.openstreetmap.org";
+  fixed-address ironbelly.oob.openstreetmap.org;
 }
 
-host idris.oob.openstreetmap.org {
-  hardware ethernet 00:1f:29:68:bd:b6;
-  server-name "idris.oob.openstreetmap.org";
-  fixed-address idris.oob.openstreetmap.org;
+host karm.oob.openstreetmap.org {
+  hardware ethernet 0c:c4:7a:67:cf:c4;
+  server-name "karm.oob.openstreetmap.org";
+  fixed-address karm.oob.openstreetmap.org;
 }
 
 host noquiklos.oob.openstreetmap.org {
@@ -98,20 +86,26 @@ host noquiklos.oob.openstreetmap.org {
   fixed-address noquiklos.oob.openstreetmap.org;
 }
 
-host norbert.oob.openstreetmap.org {
-  hardware ethernet 00:1c:c4:7c:14:f6;
-  server-name "norbert.oob.openstreetmap.org";
-  fixed-address norbert.oob.openstreetmap.org;
+host orm.oob.openstreetmap.org {
+  hardware ethernet 00:e0:81:c5:26:80;
+  server-name "orm.oob.openstreetmap.org";
+  fixed-address orm.oob.openstreetmap.org;
+}
+
+host ouroboros.oob.openstreetmap.org {
+  hardware ethernet d4:85:64:4c:3d:00;
+  server-name "ouroboros.oob.openstreetmap.org";
+  fixed-address ouroboros.oob.openstreetmap.org;
 }
 
-host poldi.oob.openstreetmap.org {
-  hardware ethernet 00:e0:81:c5:2b:b7;
-  server-name "poldi.oob.openstreetmap.org";
-  fixed-address poldi.oob.openstreetmap.org;
+host pummelzacken.oob.openstreetmap.org {
+  hardware ethernet 00:25:90:cf:72:73;
+  server-name "pummelzacken.oob.openstreetmap.org";
+  fixed-address pummelzacken.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;
 }
@@ -128,50 +122,104 @@ host smaug.oob.openstreetmap.org {
   fixed-address smaug.oob.openstreetmap.org;
 }
 
-host soup.oob.openstreetmap.org {
-  hardware ethernet 00:17:a4:37:ec:88;
-  server-name "soup.oob.openstreetmap.org";
-  fixed-address soup.oob.openstreetmap.org;
-}
-
 host spike-01.oob.openstreetmap.org {
-  hardware ethernet 00:1a:4b:a5:bd:2a;
+  hardware ethernet 1c:c1:de:e8:1a:1c;
   server-name "spike-01.oob.openstreetmap.org";
   fixed-address spike-01.oob.openstreetmap.org;
 }
 
 host spike-02.oob.openstreetmap.org {
-  hardware ethernet 00:1b:78:04:37:de;
+  hardware ethernet 68:b5:99:af:d6:9c;
   server-name "spike-02.oob.openstreetmap.org";
   fixed-address spike-02.oob.openstreetmap.org;
 }
 
 host spike-03.oob.openstreetmap.org {
-  hardware ethernet 00:19:bb:39:3c:64;
+  hardware ethernet 1c:c1:de:79:61:98;
   server-name "spike-03.oob.openstreetmap.org";
   fixed-address spike-03.oob.openstreetmap.org;
 }
 
+host tiamat-00.oob.openstreetmap.org {
+  hardware ethernet 00:25:90:1a:76:01;
+  server-name "tiamat-00.oob.openstreetmap.org";
+  fixed-address tiamat-00.oob.openstreetmap.org;
+}
+
+host tiamat-01.oob.openstreetmap.org {
+  hardware ethernet 00:25:90:1a:75:78;
+  server-name "tiamat-01.oob.openstreetmap.org";
+  fixed-address tiamat-01.oob.openstreetmap.org;
+}
+
+host tiamat-02.oob.openstreetmap.org {
+  hardware ethernet 00:25:90:1f:10:e3;
+  server-name "tiamat-02.oob.openstreetmap.org";
+  fixed-address tiamat-02.oob.openstreetmap.org;
+}
+
+host tiamat-03.oob.openstreetmap.org {
+  hardware ethernet 00:25:90:1a:75:74;
+  server-name "tiamat-03.oob.openstreetmap.org";
+  fixed-address tiamat-03.oob.openstreetmap.org;
+}
+
+host tiamat-11.oob.openstreetmap.org {
+  hardware ethernet 00:25:90:2c:cd:68;
+  server-name "tiamat-11.oob.openstreetmap.org";
+  fixed-address tiamat-11.oob.openstreetmap.org;
+}
+
+host tiamat-12.oob.openstreetmap.org {
+  hardware ethernet 00:25:90:1f:0a:9c;
+  server-name "tiamat-12.oob.openstreetmap.org";
+  fixed-address tiamat-12.oob.openstreetmap.org;
+}
+
+host tiamat-13.oob.openstreetmap.org {
+  hardware ethernet 00:25:90:1f:17:ed;
+  server-name "tiamat-13.oob.openstreetmap.org";
+  fixed-address tiamat-13.oob.openstreetmap.org;
+}
+
+host tiamat-21.oob.openstreetmap.org {
+  hardware ethernet 00:25:90:29:a8:d7;
+  server-name "tiamat-21.oob.openstreetmap.org";
+  fixed-address tiamat-21.oob.openstreetmap.org;
+}
+
+host tiamat-22.oob.openstreetmap.org {
+  hardware ethernet 00:25:90:29:a8:01;
+  server-name "tiamat-22.oob.openstreetmap.org";
+  fixed-address tiamat-22.oob.openstreetmap.org;
+}
+
+host tiamat-23.oob.openstreetmap.org {
+  hardware ethernet 00:25:90:29:a7:ff;
+  server-name "tiamat-23.oob.openstreetmap.org";
+  fixed-address tiamat-23.oob.openstreetmap.org;
+}
+
 host thorn-01.oob.openstreetmap.org {
-  hardware ethernet 00:19:bb:35:87:94;
+  hardware ethernet 44:1e:a1:57:8f:fe;
   server-name "thorn-01.oob.openstreetmap.org";
   fixed-address thorn-01.oob.openstreetmap.org;
 }
 
 host thorn-02.oob.openstreetmap.org {
-  hardware ethernet 00:19:bb:39:9b:a6;
+  hardware ethernet e4:11:5b:ce:e8:aa;
   server-name "thorn-02.oob.openstreetmap.org";
   fixed-address thorn-02.oob.openstreetmap.org;
 }
 
 host thorn-03.oob.openstreetmap.org {
-  hardware ethernet 00:19:bb:37:f3:ce;
+  hardware ethernet 44:1e:a1:60:1f:92;
   server-name "thorn-03.oob.openstreetmap.org";
   fixed-address thorn-03.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;
 }