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

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

diff --git a/roles/thorn-01.rb b/roles/thorn-01.rb
index 32d92d8f58f3c1e2545584d85fe25ea2a037885d..5e40db358de0838b4ea3fb1861d3d21a21f29fb5 100644 (file)
--- a/roles/thorn-01.rb
+++ b/roles/thorn-01.rb
@@ -5,10 +5,13 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth0",
+        :interface => "bond0",
         :role => :internal,
         :family => :inet,
-        :address => "146.179.159.165"
+        :address => "10.0.48.51",
+        :bond => {
+          :slaves => %w[eth0 eth1]
+        }
       }
     }
   },
@@ -20,14 +23,10 @@ default_attributes(
         "net.ipv6.conf.eth0.accept_ra" => "0"
       }
     }
-  },
-  :web => {
-    :readonly_database_host => "db-slave"
   }
 )
 
 run_list(
-  "role[ic]",
-  "role[hp-g5]",
+  "role[equinix]",
   "role[web-backend]"
 )