Merge remote-tracking branch 'github/pull/472'

[chef.git] / roles / osuosl.rb

diff --git a/roles/osuosl.rb b/roles/osuosl.rb
index cae3296905a6166c26cd3fd244647c3089d750f0..899176dcbca7fac1579fc1a9f112d0a3532941fe 100644 (file)
--- a/roles/osuosl.rb
+++ b/roles/osuosl.rb
@@ -2,17 +2,25 @@ name "osuosl"
 description "Role applied to all servers at OSUOSL"
 
 default_attributes(
+  :accounts => {
+    :users => {
+      :osuadmin => { :status => :administrator }
+    }
+  },
+  :hosted_by => "OSUOSL",
+  :location => "Corvallis, Oregon",
+  :timezone => "PST8PDT",
   :networking => {
-    :nameservers => [ "8.8.8.8", "8.8.4.4" ],
     :roles => {
       :external => {
         :inet => {
           :prefix => "28",
           :gateway => "140.211.167.97"
+        },
+        :inet6 => {
+          :prefix => "64",
+          :gateway => "2605:bc80:3010:700::1"
         }
-      },
-      :external => {
-        :zone => "ool"
       }
     }
   }
@@ -20,7 +28,7 @@ default_attributes(
 
 override_attributes(
   :ntp => {
-    :servers => [ "ntp.osuosl.org" ]
+    :servers => ["ntp.osuosl.org"]
   }
 )