From: Tom Hughes <tom@compton.nu>
Date: Fri, 7 Mar 2025 16:59:00 +0000 (+0000)
Subject: Move OSUOSL hosts to use interface inheritance for network configuration
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/7d537eb5d7627524e24c7d3f404b6472e0130657?hp=--cc

Move OSUOSL hosts to use interface inheritance for network configuration
---

7d537eb5d7627524e24c7d3f404b6472e0130657
diff --git a/roles/osuosl.rb b/roles/osuosl.rb
index 99a3a992f..83fd46a72 100644
--- a/roles/osuosl.rb
+++ b/roles/osuosl.rb
@@ -11,8 +11,10 @@ default_attributes(
   :location => "Corvallis, Oregon",
   :timezone => "US/Pacific",
   :networking => {
-    :roles => {
+    :interfaces => {
       :external => {
+        :interface => "bond0",
+        :role => :external,
         :inet => {
           :prefix => "28",
           :gateway => "140.211.167.97"
diff --git a/roles/piasa.rb b/roles/piasa.rb
index b1e775ad4..085fdc66e 100644
--- a/roles/piasa.rb
+++ b/roles/piasa.rb
@@ -5,8 +5,6 @@ default_attributes(
   :networking => {
     :interfaces => {
       :external => {
-        :interface => "bond0",
-        :role => :external,
         :inet => {
           :address => "140.211.167.101"
         },
diff --git a/roles/stormfly-03.rb b/roles/stormfly-03.rb
index d81b06c9f..374d2ab90 100644
--- a/roles/stormfly-03.rb
+++ b/roles/stormfly-03.rb
@@ -5,8 +5,6 @@ default_attributes(
   :networking => {
     :interfaces => {
       :external => {
-        :interface => "bond0",
-        :role => :external,
         :inet => {
           :address => "140.211.167.99"
         },
diff --git a/roles/stormfly-04.rb b/roles/stormfly-04.rb
index 3a7d1a7c3..bcc11518a 100644
--- a/roles/stormfly-04.rb
+++ b/roles/stormfly-04.rb
@@ -8,8 +8,6 @@ default_attributes(
   :networking => {
     :interfaces => {
       :external => {
-        :interface => "bond0",
-        :role => :external,
         :inet => {
           :address => "140.211.167.100"
         },