X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/243ec909a52ccbdb5bfdd5becdfb80ab6a76419e..da8f75f725d2c105419c351195231bac70a46e7c:/roles/horntail.rb

diff --git a/roles/horntail.rb b/roles/horntail.rb
index e8a8192de..4b64c8155 100644
--- 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]"
 )