imagery: increase randomise delay on mapserver restart

[chef.git] / roles / grisu.rb

diff --git a/roles/grisu.rb b/roles/grisu.rb
index 613f9f27ca9230761a1304391fc8e545ebcc7c0a..17b0aaa556fe9c64b8558e12f34dac231626e369 100644 (file)
--- a/roles/grisu.rb
+++ b/roles/grisu.rb
@@ -4,65 +4,34 @@ description "Master role applied to grisu"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

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

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

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

         :bond => {
         :bond => {

-          :slaves => %w(em1 em2)
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]

         }
       },
         }
       },

-      :external_ipv4 => {
-        :interface => "bond0.214",
+      :external => {
+        :interface => "bond0.101",

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

-        :family => :inet,
-        :address => "89.16.162.20"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.214",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:41c9:2:d6::20"
-      }
-    }
-  },
-  :openvpn => {
-    :address => "10.0.16.5",
-    :tunnels => {
-      :ic2bm => {
-        :port => "1194",
-        :mode => "server",
-        :peer => {
-          :host => "ironbelly.openstreetmap.org"
-        }
-      },
-      :aws2bm => {
-        :port => "1195",
-        :mode => "server",
-        :peer => {
-          :host => "fafnir.openstreetmap.org"
-        }
-      },
-      :ucl2bm => {
-        :port => "1196",
-        :mode => "server",
-        :peer => {
-          :host => "ridley.openstreetmap.org"
+        :inet => {
+          :address => "184.104.226.113"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::11"

         }
       }
     }
         }
       }
     }

-  },
-  :planet => {
-    :replication => "disabled"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[bytemark]",
-  "role[hp-dl180-g6]",
-  "role[gateway]",
-  "role[web-storage]",
-  "role[planet]",
-  "recipe[openvpn]"
+  "role[equinix-dub]",
+  "role[overpass-query]"

 )
 )