From: Tom Hughes <tom@compton.nu>
Date: Mon, 30 Sep 2024 10:08:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pull/697'
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/f6310358cfbc2d2c61b1723d862f8139ee91ce53?hp=3b7db03656d2f783af8ad7f9e6c19716773da602

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

diff --git a/cookbooks/bind/templates/default/db.10.erb b/cookbooks/bind/templates/default/db.10.erb
index 52f7b6b4f..fcdc5e839 100644
--- 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.
+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.
@@ -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.
+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.
diff --git a/cookbooks/dhcpd/templates/default/dhcpd.conf.erb b/cookbooks/dhcpd/templates/default/dhcpd.conf.erb
index 26d1271be..5c934bf07 100644
--- 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;
 }
 
+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";
diff --git a/roles/lockheed.rb b/roles/lockheed.rb
new file mode 100644
index 000000000..ff2494dca
--- /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]"
+)