Merge duplicate hash entries

[chef.git] / roles / ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index c73baca1dba1b6deb61d6b35ed9378f3415ca715..efcdd4c7dae67bd72b183e9358a6babadb07ad12 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -2,7 +2,13 @@ name "ridley"
 description "Master role applied to ridley"
 
 default_attributes(
-  :dhcpd =>{
+  :apache => {
+    :ssl => {
+      :certificate => "osmfoundation",
+      :certificate_chain => "startcom"
+    }
+  },
+  :dhcpd => {
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"
   },
@@ -19,7 +25,7 @@ default_attributes(
         :category => "Ups",
         :values => {
           :load => {
-            :sum => [ "apcpdu_apc1.load", "apcpdu_apc2.load", "apcpdu_apc3.load" ],
+            :sum => ["apcpdu_apc1.load", "apcpdu_apc2.load", "apcpdu_apc3.load"],
             :label => "Load"
           }
         }
@@ -32,14 +38,14 @@ default_attributes(
         :interface => "eth0",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.102"
+        :address => "128.40.45.205"
       },
       :internal_ipv4 => {
         :interface => "eth1",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.3"
-      },
+      }
     }
   },
   :openvpn => {
@@ -49,7 +55,7 @@ default_attributes(
         :port => "1194",
         :mode => "client",
         :peer => {
-          :host => "horntail.openstreetmap.org",
+          :host => "ironbelly.openstreetmap.org",
           :port => "1194"
         }
       },
@@ -75,7 +81,8 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-internal]",
+  "role[ucl-wolfson]",
+  "role[hp-g6]",
   "role[gateway]",
   "role[foundation]",
   "role[stateofthemap]",