Merge remote-tracking branch 'github/pull/472'

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

diff --git a/roles/thorn-02.rb b/roles/thorn-02.rb
index 7f37e8b17ff397e27d7a69f1fae4d4d0b5a9cbef..9ec920d323f852dbf87f3203979e033b7f5a69f1 100644 (file)
--- a/roles/thorn-02.rb
+++ b/roles/thorn-02.rb
@@ -5,29 +5,18 @@ 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",
-        "net.ipv6.conf.eth0.accept_ra" => "0"
-      }
-    }
-  },
-  :web => {
-    :readonly_database_host => "db-slave"
   }
 )
 
 run_list(
-  "role[ic]",
-  "role[hp-g5]",
-  "role[web-backend]"
+  "role[equinix-ams]"
 )