Apply the chef-server and chef-repository roles to ironbelly

[chef.git] / roles / horntail.rb

diff --git a/roles/horntail.rb b/roles/horntail.rb
index e8a8192de785cabd023d8e0cf446cf2ed89fd7e8..4b64c8155235c9aff5bf127501449d9634fb7ece 100644 (file)
--- a/roles/horntail.rb
+++ b/roles/horntail.rb
@@ -65,18 +65,6 @@ default_attributes(
       }
     }
   },
-  :openvpn => {
-    :address => "10.0.16.2",
-    :tunnels => {
-      :ic2ucl => {
-        :port => "1194",
-        :mode => "server",
-        :peer => {
-          :host => "ridley.openstreetmap.org"
-        }
-      }
-    }
-  },
   :rsyncd => {
     :modules => {
       :hosts => {
@@ -118,13 +106,12 @@ default_attributes(
 
 run_list(
   "role[ic]",
-  "role[gateway]",
   "role[chef-server]",
   "role[chef-repository]",
   "role[planet]",
   "role[stats]",
   "role[web-storage]",
   "role[backup]",
-  "recipe[rsyncd]",
-  "recipe[openvpn]"
+  "role[supybot]",
+  "recipe[rsyncd]"
 )