Merge remote-tracking branch 'github/pull/169'

[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 6728745babccff3bf72631048adc57184ed78151..53b568672afe1a4667c7b58e474d772743ebc66b 100644 (file)
--- a/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
+++ b/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
@@ -14,24 +14,6 @@ subnet <%= interface[:network] %> netmask <%= interface[:netmask] %> {
 }
 <% end -%>
 
 }
 <% end -%>
 

-host apc1.<%= @domain %> {
-  hardware ethernet 00:c0:b7:77:f3:d8;
-  server-name "apc1.<%= @domain %>";
-  fixed-address apc1.<%= @domain %>;
-}
-
-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";
 host ascalon.oob.openstreetmap.org {
   hardware ethernet 00:19:bb:39:3c:64;
   server-name "ascalon.oob.openstreetmap.org";


@@ -56,6 +38,12 @@ host draco.oob.openstreetmap.org {
   fixed-address draco.oob.openstreetmap.org;
 }
 
   fixed-address draco.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";
 host errol.oob.openstreetmap.org {
   hardware ethernet 00:e0:81:c0:8d:01;
   server-name "errol.oob.openstreetmap.org";


@@ -164,12 +152,66 @@ host spike-03.oob.openstreetmap.org {
   fixed-address 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-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;
   server-name "thorn-01.oob.openstreetmap.org";
 host thorn-01.oob.openstreetmap.org {
   hardware ethernet 00:19:bb:35:87:94;
   server-name "thorn-01.oob.openstreetmap.org";