dev: Mitigate env HTTP_PROXY via cgi proxy header

[chef.git] / roles / norbert.rb

diff --git a/roles/norbert.rb b/roles/norbert.rb
index c8356949a2fc35894a718b90af0dd60d41efc30a..a96812200bf7b62d861b377266a0d14349059aab 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -4,7 +4,8 @@ description "Master role applied to norbert"
 default_attributes(
   :accounts => {
     :users => {
 default_attributes(
   :accounts => {
     :users => {

-      :yellowbkpk => { :status => :administrator }
+      :yellowbkpk => { :status => :administrator },
+      :pnorman => { :status => :user }

     }
   },
   :exim => {
     }
   },
   :exim => {


@@ -24,7 +25,7 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
         :interface => "eth1",
         :role => :external,
         :family => :inet,

-        :address => "128.40.168.100"
+        :address => "128.40.45.202"

       }
     }
   },
       }
     }
   },


@@ -34,15 +35,16 @@ default_attributes(
       :parameters => {
         "block/cciss\!c0d0/queue/nr_requests" => "512",
         "block/cciss\!c0d1/queue/nr_requests" => "512",
       :parameters => {
         "block/cciss\!c0d0/queue/nr_requests" => "512",
         "block/cciss\!c0d1/queue/nr_requests" => "512",

-       "block/cciss\!c0d0/queue/scheduler" => "noop",
-       "block/cciss\!c0d1/queue/scheduler" => "noop",
-       "block/sda/queue/nr_requests" => "512",
-       "block/sda/queue/scheduler" => "deadline"
+        "block/cciss\!c0d0/queue/scheduler" => "noop",
+        "block/cciss\!c0d1/queue/scheduler" => "noop",
+        "block/sda/queue/nr_requests" => "512",
+        "block/sda/queue/scheduler" => "deadline"

       }
     }
   }
 )
 
 run_list(
       }
     }
   }
 )
 
 run_list(

-  "role[ucl-internal]"
+  "role[ucl-wolfson]",
+  "role[hp-g5]"

 )
 )