Add role for lockheed

diff --git a/cookbooks/bind/templates/default/db.10.erb b/cookbooks/bind/templates/default/db.10.erb
index 52f7b6b4fbc5b6cae2dcaca2b9053abefb00a259..fcdc5e8390f57c6a33cc2ced038c537f67dd620b 100644 (file)
--- a/cookbooks/bind/templates/default/db.10.erb
+++ b/cookbooks/bind/templates/default/db.10.erb
@@ -38,6 +38,7 @@ $TTL  604800
 13.48.0                IN      PTR     spike-08.ams.openstreetmap.org.
 14.48.0                IN      PTR     tabaluga.ams.openstreetmap.org.
 15.48.0                IN      PTR     odin.ams.openstreetmap.org.
 13.48.0                IN      PTR     spike-08.ams.openstreetmap.org.
 14.48.0                IN      PTR     tabaluga.ams.openstreetmap.org.
 15.48.0                IN      PTR     odin.ams.openstreetmap.org.

+16.48.0                IN      PTR     lockheed.ams.openstreetmap.org.

 17.48.0                IN      PTR     norbert.ams.openstreetmap.org.
 49.48.0                IN      PTR     snap-01.ams.openstreetmap.org.
 50.48.0                IN      PTR     karm.ams.openstreetmap.org.
 17.48.0                IN      PTR     norbert.ams.openstreetmap.org.
 49.48.0                IN      PTR     snap-01.ams.openstreetmap.org.
 50.48.0                IN      PTR     karm.ams.openstreetmap.org.


@@ -53,6 +54,7 @@ $TTL  604800
 13.49.0                IN      PTR     spike-08.oob.openstreetmap.org.
 14.49.0                IN      PTR     tabaluga.oob.openstreetmap.org.
 15.49.0                IN      PTR     odin.oob.openstreetmap.org.
 13.49.0                IN      PTR     spike-08.oob.openstreetmap.org.
 14.49.0                IN      PTR     tabaluga.oob.openstreetmap.org.
 15.49.0                IN      PTR     odin.oob.openstreetmap.org.

+16.49.0                IN      PTR     lockheed.oob.openstreetmap.org.

 17.49.0                IN      PTR     norbert.oob.openstreetmap.org.
 49.49.0                IN      PTR     snap-01.oob.openstreetmap.org.
 50.49.0                IN      PTR     karm.oob.openstreetmap.org.
 17.49.0                IN      PTR     norbert.oob.openstreetmap.org.
 49.49.0                IN      PTR     snap-01.oob.openstreetmap.org.
 50.49.0                IN      PTR     karm.oob.openstreetmap.org.

diff --git a/cookbooks/dhcpd/templates/default/dhcpd.conf.erb b/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
index 26d1271be53971759e1942995e2b83a325f8795a..5c934bf078b587a0437a2b90c21a6caf8fdd70fb 100644 (file)
--- a/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
+++ b/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
@@ -157,6 +157,12 @@ host konqi.oob.openstreetmap.org {
   fixed-address konqi.oob.openstreetmap.org;
 }
 
   fixed-address konqi.oob.openstreetmap.org;
 }
 

+host lockheed.oob.openstreetmap.org {
+  hardware ethernet f4:03:43:51:5e:d2;
+  server-name "lockheed.oob.openstreetmap.org";
+  fixed-address lockheed.oob.openstreetmap.org;
+}
+

 host longma.oob.openstreetmap.org {
   hardware ethernet 3c:ec:ef:2f:6d:4e;
   server-name "longma.oob.openstreetmap.org";
 host longma.oob.openstreetmap.org {
   hardware ethernet 3c:ec:ef:2f:6d:4e;
   server-name "longma.oob.openstreetmap.org";

diff --git a/roles/lockheed.rb b/roles/lockheed.rb
new file mode 100644 (file)
index 0000000..ff2494d
--- /dev/null
+++ b/roles/lockheed.rb
@@ -0,0 +1,37 @@
+name "lockheed"
+description "Master role applied to lockheed"
+
+default_attributes(
+  :networking => {
+    :interfaces => {
+      :internal => {
+        :interface => "bond0",
+        :role => :internal,
+        :inet => {
+          :address => "10.0.48.16"
+        },
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno49 eno50]
+        }
+      },
+      :external => {
+        :interface => "bond0.3",
+        :role => :external,
+        :inet => {
+          :address => "184.104.179.144"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::10"
+        }
+      }
+    }
+  }
+)
+
+run_list(
+  "role[equinix-ams]",
+  "role[hp-g9]"
+)