Add VLAN numbers to internal interfaces of UCL machines

[chef.git] / roles / ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index db468a48926ab12d93476f0a5bf6c57810a56709..d87bd4b1d1a790841aaf441d3a51ae9846a2dde5 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -3,7 +3,7 @@ description "Master role applied to ridley"
 
 default_attributes(
   :ssl => {
-    :certificates => ["osmfoundation", "openstreetmap"]
+    :certificates => %w(osmfoundation openstreetmap)
   },
   :apache => {
     :ssl => {
@@ -33,13 +33,13 @@ default_attributes(
   :networking => {
     :interfaces => {
       :external_ipv4 => {
-        :interface => "eth0",
+        :interface => "eth0.2800",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.205"
+        :address => "193.60.236.19"
       },
       :internal_ipv4 => {
-        :interface => "eth1",
+        :interface => "eth0.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.3"
@@ -87,7 +87,7 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wolfson]",
+  "role[ucl-slough]",
   "role[hp-dl360-g6]",
   "role[gateway]",
   "role[foundation]",