Enable gpximport, statistics and cleanup roles on spike-01

[chef.git] / roles / ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index d925702c8ee5489a743da3b832318e678838f3f6..bb07b565fe21c7ac4c270b542599a27da6bbb61e 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -8,11 +8,6 @@ default_attributes(
       :certificate_chain => "startcom"
     }
   },
-  :chef => {
-    :client => {
-      :version => "12.1.2-1"
-    }
-  },
   :dhcpd => {
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"
@@ -72,9 +67,17 @@ default_attributes(
           :port => "1194"
         }
       },
-      :firefishy => {
+      :ucl2bm => {
         :port => "1196",
         :mode => "client",
+        :peer => {
+          :host => "grisu.openstreetmap.org",
+          :port => "1196"
+        }
+      },
+      :firefishy => {
+        :port => "1197",
+        :mode => "client",
         :peer => {
           :host => "home.firefishy.com",
           :port => "1194",
@@ -87,7 +90,7 @@ default_attributes(
 
 run_list(
   "role[ucl-wolfson]",
-  "role[hp-g6]",
+  "role[hp-dl360-g6]",
   "role[gateway]",
   "role[foundation]",
   "role[stateofthemap]",