Merge remote-tracking branch 'github/pull/358' into master

[chef.git] / roles / lysator.rb

diff --git a/roles/lysator.rb b/roles/lysator.rb
index 22f34ea5273cf744611118e341601c47ad33ec82..09c2aaff7e588471b218f4677f44aab6c7216947 100644 (file)
--- a/roles/lysator.rb
+++ b/roles/lysator.rb
@@ -9,18 +9,13 @@ default_attributes(
     }
   },
   :hosted_by => "Lysator",
     }
   },
   :hosted_by => "Lysator",

-  :location => "Linköping, Sweden",
-  :networking => {
-    :nameservers => ["130.236.254.225", "2001:6b0:17:f0a0::e1", "130.236.254.4"],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
-  }
+  :location => "Linköping, Sweden"

 )
 
 override_attributes(
 )
 
 override_attributes(

+  :networking => {
+    :nameservers => ["130.236.254.225", "2001:6b0:17:f0a0::e1", "130.236.254.4"]
+  },

   :ntp => {
     :servers => ["0.se.pool.ntp.org", "1.se.pool.ntp.org", "europe.pool.ntp.org"]
   }
   :ntp => {
     :servers => ["0.se.pool.ntp.org", "1.se.pool.ntp.org", "europe.pool.ntp.org"]
   }