Move OSUOSL hosts to use interface inheritance for network configuration

diff --git a/roles/osuosl.rb b/roles/osuosl.rb
index 99a3a992fd2a0ee1e30ceb8d96c32f5340f6d35b..83fd46a72df6b3e1afd12fe57b6fe672e418d427 100644 (file)
--- 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 b1e775ad49bde510ef767c8111d0b5f0fd0b8e46..085fdc66e31a11847950cd4221a16a6b3b8f9055 100644 (file)
--- 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 d81b06c9f77cadf104e4e7f0e2c51d518c93c6f8..374d2ab90a87b7eaeee9694a151e2e472157cdcc 100644 (file)
--- 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 3a7d1a7c3dba0d748a2540ebacbefe94c604cd41..bcc11518ae69857948fb21ae7de60eb922776aa6 100644 (file)
--- 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"
         },