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

[chef.git] / roles / osuosl.rb

diff --git a/roles/osuosl.rb b/roles/osuosl.rb
index 41d7c6e90a543663b499b55cebc3ab45283803ec..899176dcbca7fac1579fc1a9f112d0a3532941fe 100644 (file)
--- a/roles/osuosl.rb
+++ b/roles/osuosl.rb
@@ -2,14 +2,24 @@ name "osuosl"
 description "Role applied to all servers at OSUOSL"
 
 default_attributes(
 description "Role applied to all servers at OSUOSL"
 
 default_attributes(

+  :accounts => {
+    :users => {
+      :osuadmin => { :status => :administrator }
+    }
+  },
+  :hosted_by => "OSUOSL",
+  :location => "Corvallis, Oregon",
+  :timezone => "PST8PDT",

   :networking => {
   :networking => {

-    :nameservers => [ "8.8.8.8", "8.8.4.4" ],

     :roles => {
       :external => {
     :roles => {
       :external => {

-        :zone => "ool",

         :inet => {
           :prefix => "28",
           :gateway => "140.211.167.97"
         :inet => {
           :prefix => "28",
           :gateway => "140.211.167.97"

+        },
+        :inet6 => {
+          :prefix => "64",
+          :gateway => "2605:bc80:3010:700::1"

         }
       }
     }
         }
       }
     }


@@ -18,7 +28,7 @@ default_attributes(
 
 override_attributes(
   :ntp => {
 
 override_attributes(
   :ntp => {

-    :servers => [ "ntp.osuosl.org" ]
+    :servers => ["ntp.osuosl.org"]

   }
 )
 
   }
 )