Fix en.openstreetmap.town container

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

diff --git a/roles/spike-06.rb b/roles/spike-06.rb
index 8ecaeecb7b645b98fe3453dcd5cfe735853aa44b..6be7da43dec7dfb0d44d81c971f256eb8684505d 100644 (file)
--- a/roles/spike-06.rb
+++ b/roles/spike-06.rb
@@ -4,32 +4,37 @@ description "Master role applied to spike-06"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

-      :internal_ipv4 => {
+      :internal => {

         :interface => "bond0",
         :role => :internal,
         :interface => "bond0",
         :role => :internal,

-        :family => :inet,
-        :address => "10.0.48.11",
+        :inet => {
+          :address => "10.0.48.11"
+        },

         :bond => {
         :bond => {

+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",

           :slaves => %w[eno1 eno2]
         }
       },
           :slaves => %w[eno1 eno2]
         }
       },

-      :external_ipv4 => {
-        :interface => "bond0.2",
+      :external => {
+        :interface => "bond0.3",

         :role => :external,
         :role => :external,

-        :family => :inet,
-        :address => "130.117.76.11"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:B"
+        :inet => {
+          :address => "184.104.179.139"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::b"
+        }

       }
     }
   }
 )
 
 run_list(
       }
     }
   }
 )
 
 run_list(

-  "role[equinix]",
-  "role[hp-g9]"
+  "role[equinix-ams]",
+  "role[hp-g9]",
+  "role[web-frontend]",
+  "role[web-statistics]",
+  "role[web-cleanup]"

 )
 )