Update configuration for move from Imperial to Amsterdam

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

diff --git a/roles/thorn-02.rb b/roles/thorn-02.rb
index 23439c6b4975968df3e09dba93e2c5de7d1c4168..84f3ccd3821a605b869d589224a7782de39eb101 100644 (file)
--- a/roles/thorn-02.rb
+++ b/roles/thorn-02.rb
@@ -5,26 +5,28 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth0",
+        :interface => "bond0",
         :role => :internal,
         :family => :inet,
-        :address => "146.179.159.166"
+        :address => "10.0.48.52",
+        :bond => {
+          :slaves => %w[eth0 eth1]
+        }
       }
     }
   },
   :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]"
 )