blog: merge in opengeodata redirects

[chef.git] / roles / dribble.rb

diff --git a/roles/dribble.rb b/roles/dribble.rb
index cc992c589552e58d77b49cec350a2a228c59fde9..ce6da2faca4b9b97c69718d87a6b13dd8bc231a1 100644 (file)
--- a/roles/dribble.rb
+++ b/roles/dribble.rb
@@ -17,49 +17,26 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },

-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :source_route_table => 100,
-        :inet => {
-          :address => "130.117.76.4",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
-        },
-        :inet6 => {
-          :address => "2001:978:2:2c::172:4",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
-        }
-      },

       :external => {
         :interface => "bond0.3",
         :role => :external,
       :external => {
         :interface => "bond0.3",
         :role => :external,

-        :metric => 150,
-        :source_route_table => 150,

         :inet => {
         :inet => {

-          :address => "184.104.179.132",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.132"

         },
         :inet6 => {
         },
         :inet6 => {

-          :address => "2001:470:1:fa1::4",
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::4"

         }
       }
     }
   },
   :accounts => {
     :users => {
         }
       }
     }
   },
   :accounts => {
     :users => {

-      :msbarry => { :status => :user }
+      :stereo => { :status => :administrator }

     }
   }
 )
 
 run_list(
     }
   }
 )
 
 run_list(

-  "role[equinix-ams]"
+  "role[equinix-ams]",
+  "role[taginfo]"

 )
 )