Ignore failures disabling shorewall

[chef.git] / roles / osuosl.rb

diff --git a/roles/osuosl.rb b/roles/osuosl.rb
index e6aa9632bbc1b44039b2fbdfc2ae0e08c9e0c241..489152a0289d50cf9e7343349b1f06c7c77403ae 100644 (file)
--- a/roles/osuosl.rb
+++ b/roles/osuosl.rb
@@ -7,14 +7,20 @@ default_attributes(
       :osuadmin => { :status => :administrator }
     }
   },
+  :hosted_by => "OSUOSL",
+  :location => "Corvallis, Oregon",
+  :timezone => "PST8PDT",
   :networking => {
-    :nameservers => [ "8.8.8.8", "8.8.4.4" ],
+    :nameservers => ["8.8.8.8", "8.8.4.4"],
     :roles => {
       :external => {
-        :zone => "ool",
         :inet => {
           :prefix => "28",
           :gateway => "140.211.167.97"
+        },
+        :inet6 => {
+          :prefix => "64",
+          :gateway => "2605:bc80:3010:700::1"
         }
       }
     }
@@ -23,7 +29,7 @@ default_attributes(
 
 override_attributes(
   :ntp => {
-    :servers => [ "ntp.osuosl.org" ]
+    :servers => ["ntp.osuosl.org"]
   }
 )