imagery: apply us_imagery on ironbelly

[chef.git] / roles / odin.rb

diff --git a/roles/odin.rb b/roles/odin.rb
index c79f9c754bdd1e2fe9cd7632dd3f1962678eb647..03d0d59b3b6cfef98f5c2f9e550ee067fdfa0d2f 100644 (file)
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -14,41 +14,17 @@ default_attributes(
           :mode => "802.3ad",
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4",
-          :slaves => %w[eno1 eno2]
-        }
-      },
-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
-        :inet => {
-          :address => "130.117.76.15",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
-        },
-        :inet6 => {
-          :address => "2001:978:2:2c::172:f",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
+          :slaves => %w[eno1np0 eno2np1]
         }
       },
       :external => {
         :interface => "bond0.3",
         :role => :external,
-        :source_route_table => 150,
         :inet => {
-          :address => "184.104.179.143",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.143"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::f",
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::f"
         }
       }
     }
@@ -56,8 +32,6 @@ default_attributes(
   :postgresql => {
     :settings => {
       :defaults => {
-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",
         :effective_cache_size => "16GB"
       }
     }
@@ -73,7 +47,7 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "14/main",
+      :cluster => "16/main",
       :postgis => "3"
     },
     :mapnik => "3.1",