Restore role for scorch

[chef.git] / roles / shenron.rb

diff --git a/roles/shenron.rb b/roles/shenron.rb
index 2634ec0d2c63f13a8df83007edf5fcd0683be365..b5cb9d559562b57244d40d23f68fad984e4f3c17 100644 (file)
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -2,14 +2,6 @@ name "shenron"
 description "Master role applied to shenron"
 
 default_attributes(
-  :accounts => {
-    :users => {
-      :bretth => {
-        :status => :user,
-        :shell => "/usr/bin/git-shell"
-      }
-    }
-  },
   :apache => {
     :mpm => "event",
     :event => {
@@ -17,25 +9,13 @@ default_attributes(
       :max_spare_threads => 150
     }
   },
-  :apt => {
-    :sources => ["brightbox-ruby-ng"]
-  },
   :hardware => {
+    :mcelog => {
+      :enabled => false
+    },
     :modules => [
       "it87"
     ]
-  },
-  :openvpn => {
-    :address => "10.0.16.3",
-    :tunnels => {
-      :shenron2ucl => {
-        :port => "1194",
-        :mode => "server",
-        :peer => {
-          :host => "ridley.openstreetmap.org"
-        }
-      }
-    }
   }
 )
 
@@ -58,7 +38,9 @@ override_attributes(
         :prefix => "64",
         :gateway => "fe80::1"
       }
-    }
+    },
+    :nameservers => ["1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001"],
+    :private_address => "10.0.16.100"
   }
 )
 
@@ -66,14 +48,9 @@ run_list(
   "role[bytemark]",
   "role[mail]",
   "role[lists]",
-  "role[git]",
   "role[subversion]",
   "role[trac]",
   "role[osqa]",
   "role[irc]",
-  "role[dns]",
-  "role[geodns]",
-  "role[chef-repository]",
-  "recipe[blogs]",
-  "recipe[openvpn]"
+  "recipe[blogs]"
 )