Add VLAN numbers to internal interfaces of UCL machines

[chef.git] / roles / ascalon.rb

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index 7f5e2bd710cf323c6adb7d2ebe4c15781f978976..7725f4907570646a5141d560a178cb294c02baa1 100644 (file)
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -4,11 +4,17 @@ description "Master role applied to ascalon"
 default_attributes(
   :networking => {
     :interfaces => {
+      :internal_ipv4 => {
+        :interface => "eth1.2801",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.0.18"
+      },
       :external_ipv4 => {
-        :interface => "eth1",
+        :interface => "eth1.2800",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.193"
+        :address => "193.60.236.10"
       }
     }
   },
@@ -20,6 +26,7 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wolfson]",
+  "role[ucl-slough]",
+  "role[hp-g5]",
   "role[roundup]"
 )