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

[chef.git] / roles / osuosl.rb

diff --git a/roles/osuosl.rb b/roles/osuosl.rb
index 489152a0289d50cf9e7343349b1f06c7c77403ae..99a3a992fd2a0ee1e30ceb8d96c32f5340f6d35b 100644 (file)
--- a/roles/osuosl.rb
+++ b/roles/osuosl.rb
@@ -9,9 +9,8 @@ default_attributes(
   },
   :hosted_by => "OSUOSL",
   :location => "Corvallis, Oregon",
   },
   :hosted_by => "OSUOSL",
   :location => "Corvallis, Oregon",

-  :timezone => "PST8PDT",
+  :timezone => "US/Pacific",

   :networking => {
   :networking => {

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

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