Drop last traces of old shorewall firewall zones

[chef.git] / roles / culebre.rb

diff --git a/roles/culebre.rb b/roles/culebre.rb
index 892aac944c0dd7cb28b0b9db8e30f736be8e0a35..8f266566a93071ae12b55c70fbb50c437e06da03 100644 (file)
--- a/roles/culebre.rb
+++ b/roles/culebre.rb
@@ -4,34 +4,35 @@ description "Master role applied to culebre"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "bond0",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.64.9",
+      :internal => {
+        :inet => {
+          :address => "10.0.64.9"
+        },
         :bond => {
-          :slaves => %w[eno1 eno2]
+          :slaves => %w[enp68s0f0 enp68s0f1 enp68s0f2 enp68s0f3]
         }
       },
-      :external_ipv4 => {
-        :interface => "bond0.101",
-        :role => :external,
-        :family => :inet,
-        :address => "184.104.226.105"
+      :henet => {
+        :inet => {
+          :address => "184.104.226.105"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::9"
+        }
       },
-      :external_ipv6 => {
-        :interface => "bond0.101",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:470:1:b3b::9"
+      :equinix => {
+        :inet => {
+          :address => "87.252.214.105"
+        },
+        :inet6 => {
+          :address => "2001:4d78:fe03:1c::9"
+        }
       }
     }
   },
   :postgresql => {
     :settings => {
       :defaults => {
-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",
         :effective_cache_size => "16GB"
       }
     }
@@ -47,7 +48,7 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "12/main",
+      :cluster => "16/main",
       :postgis => "3"
     },
     :mapnik => "3.1",
@@ -62,6 +63,6 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-dub]",
+  "role[equinix-dub-public]",
   "role[tile]"
 )