X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e947590c6a42789d8a1c240331d85ca637274ed4..9f6b6f0213bfc4f9700b51091a4774541c58048f:/roles/norbert.rb?ds=sidebyside

diff --git a/roles/norbert.rb b/roles/norbert.rb
index 1ab77bb8f..3cfe2ba37 100644
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -2,52 +2,35 @@ name "norbert"
 description "Master role applied to norbert"
 
 default_attributes(
-  :hardware => {
-    :shm_size => "14g"
-  },
   :networking => {
     :interfaces => {
+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.48.17",
+        :bond => {
+          :slaves => %w[enp25s0f0 enp25s0f1]
+        }
+      },
       :external_ipv4 => {
-        :interface => "ens18",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet,
-        :address => "89.234.186.100",
-        :prefix => "27",
-        :gateway => "89.234.186.97"
+        :address => "130.117.76.17"
       },
       :external_ipv6 => {
-        :interface => "ens18",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet6,
-        :address => "2a00:5884:821c::1",
-        :prefix => "48",
-        :gateway => "fe80::204:92:100:1"
-      }
-    }
-  },
-  :squid => {
-    :version => 4,
-    :cache_mem => "12288 MB",
-    :cache_dir => [
-      "rock /store/squid/rock-4096 12800 swap-timeout=200 slot-size=4096 max-size=3996",
-      "rock /store/squid/rock-8192 16000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
-      "rock /store/squid/rock-16384 22400 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
-      "rock /store/squid/rock-32768 22800 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
-    ]
-  },
-  :nginx => {
-    :cache => {
-      :proxy => {
-        :max_size => "2048M"
+        :address => "2001:978:2:2C::172:11"
       }
+
     }
-  },
-  :tilecache => {
-    :tile_parent => "france.render.openstreetmap.org"
   }
 )
 
 run_list(
-  "role[grifon]",
-  "role[tilecache]"
+  "role[equinix-ams]",
+  "role[planet]"
 )