stateofthemap: add reasonable expiry headers

[chef.git] / roles / eustace.rb

diff --git a/roles/eustace.rb b/roles/eustace.rb
index 51af9e243846072a8b6067de414de3b49e1cfee6..4aa2fdd31e80d0399775fc98663a51ac805a869d 100644 (file)
--- a/roles/eustace.rb
+++ b/roles/eustace.rb
@@ -2,31 +2,26 @@ name "eustace"
 description "Master role applied to eustace"
 
 default_attributes(
-  :chef => {
-    :client => {
-      :version => "12.1.2-1"
-    }
-  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth0",
+        :interface => "eth0.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.9"
       },
       :external_ipv4 => {
-        :interface => "eth1",
+        :interface => "eth0.2800",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.197"
+        :address => "193.60.236.14"
       }
     }
   }
 )
 
 run_list(
-  "role[ucl-wolfson]",
-  "role[hp-g6]",
+  "role[ucl]",
+  "role[hp-dl360-g6]",
   "role[piwik]"
 )