Add VLAN numbers to external interfaces of UCL machines

[chef.git] / roles / norbert.rb

diff --git a/roles/norbert.rb b/roles/norbert.rb
index b860ce55ea87754a327219ae3e60520241302252..1d499a5b40003078f17b71b5693439eb88c1c672 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -22,10 +22,10 @@ default_attributes(
         :address => "10.0.0.5"
       },
       :external_ipv4 => {
-        :interface => "eth1",
+        :interface => "eth1.2800",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.202"
+        :address => "193.60.236.17"
       }
     }
   },
@@ -35,15 +35,16 @@ default_attributes(
       :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(
-  "role[ucl-wolfson]"
+  "role[ucl-slough]",
+  "role[hp-g5]"
 )