stateofthemap: Move Chooser to container

[chef.git] / roles / norbert.rb

diff --git a/roles/norbert.rb b/roles/norbert.rb
index d90f8602dc60177e4916778a12d5cb256e094dde..9fe581a977ca314c9ee3291e52da87e378aca854 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -4,41 +4,37 @@ description "Master role applied to norbert"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.48.17",
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[enp25s0f0 enp25s0f1]
+        }
+      },

       :external_ipv4 => {
       :external_ipv4 => {

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

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

-        :address => "89.234.186.100",
-        :prefix => "27",
-        :gateway => "89.234.186.97"
+        :address => "130.117.76.17"

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

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

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

-        :address => "2a00:5884:821c::1",
-        :prefix => "48",
-        :gateway => "fe80::204:92:100:1"
+        :address => "2001:978:2:2C::172:11"

       }
       }

+

     }
     }

-  },
-  :squid => {
-    :cache_mem => "7500 MB",
-    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "france.render.openstreetmap.org",
-    :tile_siblings => [
-      "noomoahk.openstreetmap.org",
-      "nepomuk.openstreetmap.org",
-      "necrosan.openstreetmap.org",
-      "ladon.openstreetmap.org",
-      "culebre.openstreetmap.org"
-    ]

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[grifon]",
-  "role[tilecache]"
+  "role[equinix-ams]",
+  "role[geodns]",
+  "role[planet]"

 )
 )