geodns: enable include_optional_ns to please picky DNS servers

[chef.git] / roles / errol.rb

diff --git a/roles/errol.rb b/roles/errol.rb
index 17905f61de91e60957061daa32fe0a0d833ee8dd..e4db08b80ebef30e6fc62935f230639e9e9974ca 100644 (file)
--- a/roles/errol.rb
+++ b/roles/errol.rb
@@ -2,27 +2,6 @@ name "errol"
 description "Master role applied to errol"
 
 default_attributes(
 description "Master role applied to errol"
 
 default_attributes(

-  :munin => {
-    :plugins => {
-      :ipmi_temp => {
-        :CPU0belowTmax => { :critical => "10:" },
-        :CPU1belowTmax => { :critical => "10:" }
-      },
-      :sensors_fan => {
-        :contacts => "null"
-      },
-      :sensors_temp => {
-        :contacts => "null"
-      },
-      :sensors_volt => {
-        :contacts => "null",
-        :volt10 => { 
-          :warning => "3.11:3.50",
-          :critical => "2.98:3.63"
-        }
-      }
-    }
-  },

   :devices => {
     :osdsk => {
       :comment => "First os disk",
   :devices => {
     :osdsk => {
       :comment => "First os disk",


@@ -48,22 +27,23 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {

-        :interface => "eth0",
+        :interface => "eth0.2801",

         :role => :internal,
         :family => :inet,
         :address => "10.0.0.14"
       },
       :external_ipv4 => {
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.14"
       },
       :external_ipv4 => {

-        :interface => "eth1",
+        :interface => "eth0.2800",

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "128.40.45.196"
+        :address => "193.60.236.13"

       }
     }
   }
       }
     }
   }

-);
+)

 
 run_list(
 
 run_list(

-  "role[ucl-wolfson]",
+  "role[ucl]",
+  "role[tyan-s7010]",

   "role[dev]"
 )
   "role[dev]"
 )