mediawiki: disable ext js GeoIP service

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

diff --git a/roles/spike-01.rb b/roles/spike-01.rb
index 7ac4eceaead3a90d995efe0fb12544328c0d732a..801165bd5f1d6c2cbbe70deac7e89a209caddaa6 100644 (file)
--- a/roles/spike-01.rb
+++ b/roles/spike-01.rb
@@ -5,25 +5,25 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {

-        :interface => "eth0",
+        :interface => "bond0",

         :role => :internal,
         :family => :inet,
         :role => :internal,
         :family => :inet,

-        :address => "146.179.159.162",
-        :hwaddress => "00:1a:4b:a5:0f:ca"
+        :address => "10.0.48.6",
+        :bond => {
+          :slaves => %w[eth0 eth1]
+        }

       },
       :external_ipv4 => {
       },
       :external_ipv4 => {

-        :interface => "eth1",
+        :interface => "bond0.2",

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "193.63.75.99",
-        :hwaddress => "00:1a:4b:a5:fd:2a"
+        :address => "130.117.76.6"

       },
       :external_ipv6 => {
       },
       :external_ipv6 => {

-        :interface => "eth1",
+        :interface => "bond0.2",

         :role => :external,
         :family => :inet6,
         :role => :external,
         :family => :inet6,

-        :address => "2001:630:12:500:21a:4bff:fea5:fd2a",
-        :hwaddress => "00:1a:4b:a5:fd:2a"
+        :address => "2001:978:2:2C::172:6"

       }
     }
   },
       }
     }
   },


@@ -39,7 +39,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ic]",
+  "role[equinix]",

   "role[hp-dl360-g6]",
   "role[web-frontend]",
   "role[web-gpximport]",
   "role[hp-dl360-g6]",
   "role[web-frontend]",
   "role[web-gpximport]",