stateofthemap: add reasonable expiry headers

[chef.git] / roles / grindtooth.rb

diff --git a/roles/grindtooth.rb b/roles/grindtooth.rb
index 28f2c8cd9b3dc80934e49eeb9ced57a428433bf4..2d78c10b79b6ca43027f9d6000e6ba59b85c18f1 100644 (file)
--- a/roles/grindtooth.rb
+++ b/roles/grindtooth.rb
@@ -5,13 +5,13 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {

-        :interface => "em2.2801",
+        :interface => "em1.2801",

         :role => :internal,
         :family => :inet,
         :address => "10.0.0.19"
       },
       :external_ipv4 => {
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.19"
       },
       :external_ipv4 => {

-        :interface => "em2.2800",
+        :interface => "em1.2800",

         :role => :external,
         :family => :inet,
         :address => "193.60.236.15"
         :role => :external,
         :family => :inet,
         :address => "193.60.236.15"


@@ -21,7 +21,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-slough]",
-  "role[hp-dl360-g6]",
+  "role[ucl]",

   "role[taginfo]"
 )
   "role[taginfo]"
 )