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 1872158a41aab05db1a7c2b7242ce295554a7367..53b568672afe1a4667c7b58e474d772743ebc66b 100644 (file)
--- a/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
+++ b/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
@@ -14,22 +14,10 @@ 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";
+  fixed-address ascalon.oob.openstreetmap.org;

 }
 
 host bowser.oob.openstreetmap.org {
 }
 
 host bowser.oob.openstreetmap.org {


@@ -38,12 +26,24 @@ host bowser.oob.openstreetmap.org {
   fixed-address bowser.oob.openstreetmap.org;
 }
 
   fixed-address bowser.oob.openstreetmap.org;
 }
 

+host clifford.oob.openstreetmap.org {
+  hardware ethernet 1c:c1:de:78:20:d6;
+  server-name "clifford.oob.openstreetmap.org";
+  fixed-address clifford.oob.openstreetmap.org;
+}
+

 host draco.oob.openstreetmap.org {
   hardware ethernet 00:1c:c4:7a:da:dc;
   server-name "draco.oob.openstreetmap.org";
   fixed-address draco.oob.openstreetmap.org;
 }
 
 host draco.oob.openstreetmap.org {
   hardware ethernet 00:1c:c4:7a:da:dc;
   server-name "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";


@@ -51,7 +51,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;
 }


@@ -68,6 +68,12 @@ host fiddlestick.oob.openstreetmap.org {
   fixed-address 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";
 host horntail.oob.openstreetmap.org {
   hardware ethernet 00:e0:81:46:95:6e;
   server-name "horntail.oob.openstreetmap.org";


@@ -80,6 +86,12 @@ host idris.oob.openstreetmap.org {
   fixed-address idris.oob.openstreetmap.org;
 }
 
   fixed-address idris.oob.openstreetmap.org;
 }
 

+host noquiklos.oob.openstreetmap.org {
+  hardware ethernet 18:a9:05:70:b0:1e;
+  server-name "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";
 host norbert.oob.openstreetmap.org {
   hardware ethernet 00:1c:c4:7c:14:f6;
   server-name "norbert.oob.openstreetmap.org";


@@ -92,8 +104,14 @@ host poldi.oob.openstreetmap.org {
   fixed-address 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 {
 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;
 }


@@ -134,6 +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-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";


@@ -153,7 +231,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;
 }