From 9368bfa50f9ff00f9cf7f19bfa58a6caf8f0e7dd Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 7 Mar 2025 13:39:56 +0000
Subject: [PATCH] Move UCL hosts to use interface inheritance for network
 configuration

---
 roles/eddie.rb      |  1 -
 roles/ridley.rb     |  4 +---
 roles/snap-02.rb    |  1 -
 roles/ucl-public.rb | 21 +++++++++++++++++++++
 roles/ucl.rb        | 10 ++--------
 roles/ysera.rb      |  4 +---
 6 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 roles/ucl-public.rb

diff --git a/roles/eddie.rb b/roles/eddie.rb
index 61e452455..2acf524e1 100644
--- a/roles/eddie.rb
+++ b/roles/eddie.rb
@@ -6,7 +6,6 @@ default_attributes(
     :interfaces => {
       :internal => {
         :interface => "enp1s0f0.2801",
-        :role => :internal,
         :inet => {
           :address => "10.0.0.10"
         }
diff --git a/roles/ridley.rb b/roles/ridley.rb
index 0e4a66522..2a6b166c1 100644
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -20,14 +20,12 @@ default_attributes(
     :interfaces => {
       :external => {
         :interface => "eth0.2800",
-        :role => :external,
         :inet => {
           :address => "193.60.236.19"
         }
       },
       :internal => {
         :interface => "eth0.2801",
-        :role => :internal,
         :inet => {
           :address => "10.0.0.3"
         }
@@ -37,7 +35,7 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl]",
+  "role[ucl-public]",
   "role[hp-dl360-g6]",
   "role[gateway]",
   "role[foundation]",
diff --git a/roles/snap-02.rb b/roles/snap-02.rb
index 80a2b3598..2a63385b3 100644
--- a/roles/snap-02.rb
+++ b/roles/snap-02.rb
@@ -6,7 +6,6 @@ default_attributes(
     :interfaces => {
       :internal => {
         :interface => "eno1.2801",
-        :role => :internal,
         :inet => {
           :address => "10.0.0.4"
         }
diff --git a/roles/ucl-public.rb b/roles/ucl-public.rb
new file mode 100644
index 000000000..6a34e8eb4
--- /dev/null
+++ b/roles/ucl-public.rb
@@ -0,0 +1,21 @@
+name "ucl-public"
+description "Role applied to all public servers at UCL"
+
+default_attributes(
+  :networking => {
+    :interfaces => {
+      :external => {
+        :role => :external,
+        :zone => "ucl",
+        :inet => {
+          :prefix => "24",
+          :gateway => "193.60.236.254"
+        }
+      }
+    }
+  }
+)
+
+run_list(
+  "role[ucl]"
+)
diff --git a/roles/ucl.rb b/roles/ucl.rb
index 516c925d3..924b91424 100644
--- a/roles/ucl.rb
+++ b/roles/ucl.rb
@@ -4,22 +4,16 @@ description "Role applied to all servers at UCL"
 default_attributes(
   :location => "Slough, England",
   :networking => {
-    :roles => {
+    :interfaces => {
       :internal => {
         :inet => {
+          :role => :internal,
           :prefix => "20",
           :gateway => "10.0.0.3",
           :routes => {
             "10.0.0.0/8" => { :via => "10.0.0.3" }
           }
         }
-      },
-      :external => {
-        :zone => "ucl",
-        :inet => {
-          :prefix => "24",
-          :gateway => "193.60.236.254"
-        }
       }
     },
     :wireguard => {
diff --git a/roles/ysera.rb b/roles/ysera.rb
index bf256d44c..8d3c16f87 100644
--- a/roles/ysera.rb
+++ b/roles/ysera.rb
@@ -6,14 +6,12 @@ default_attributes(
     :interfaces => {
       :internal => {
         :interface => "eno1np0.2801",
-        :role => :internal,
         :inet => {
           :address => "10.0.0.15"
         }
       },
       :external => {
         :interface => "eno1np0.2800",
-        :role => :external,
         :inet => {
           :address => "193.60.236.22"
         }
@@ -115,6 +113,6 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl]",
+  "role[ucl-public]",
   "role[tile]"
 )
-- 
2.39.5