Update network configuration for Amsterdam

[chef.git] / roles / ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index d87bd4b1d1a790841aaf441d3a51ae9846a2dde5..3d742bf5fcb018f576ffa14f8d1e86d5c8f2c236 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -2,15 +2,6 @@ name "ridley"
 description "Master role applied to ridley"
 
 default_attributes(
-  :ssl => {
-    :certificates => %w(osmfoundation openstreetmap)
-  },
-  :apache => {
-    :ssl => {
-      :certificate => "osmfoundation",
-      :certificate_chain => "startcom"
-    }
-  },
   :dhcpd => {
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"
@@ -87,7 +78,7 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-slough]",
+  "role[ucl]",
   "role[hp-dl360-g6]",
   "role[gateway]",
   "role[foundation]",
@@ -96,6 +87,7 @@ run_list(
   "role[blog]",
   "role[otrs]",
   "role[donate]",
+  "recipe[hot]",
   "recipe[dhcpd]",
   "recipe[openvpn]"
 )