Track backport branches of osm2pgsql git on irc

[chef.git] / roles / thorn-01.rb

diff --git a/roles/thorn-01.rb b/roles/thorn-01.rb
index 0ce99559799d8f095381574e990237f690adfbfa..b06587b5eba12921d9fdeea9132afd843f55333a 100644 (file)
--- a/roles/thorn-01.rb
+++ b/roles/thorn-01.rb
@@ -15,16 +15,15 @@ default_attributes(
   :sysctl => {
     :ipv6_autoconf => {
       :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => { "net.ipv6.conf.eth0.autoconf" => "0" }
+      :parameters => {
+        "net.ipv6.conf.eth0.autoconf" => "0",
+        "net.ipv6.conf.eth0.accept_ra" => "0"
+      }
     }
-  },
-  :web => {
-    :readonly_database_host => "db-slave"
   }
 )
 
 run_list(
   "role[ic]",
-  "role[hp-g5]",
   "role[web-backend]"
 )