Revert "community: Fix CSRF issue with monkey patch fix"

[chef.git] / roles / culebre.rb

diff --git a/roles/culebre.rb b/roles/culebre.rb
index 931070d080ae89e8aef0117bdc3da72e8b0af01e..d798bddaecc0c34f4b682499047d1bd2b8c9f243 100644 (file)
--- a/roles/culebre.rb
+++ b/roles/culebre.rb
@@ -4,11 +4,12 @@ description "Master role applied to culebre"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.64.9",
+        :inet => {
+          :address => "10.0.64.9"
+        },
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
@@ -16,25 +17,42 @@ default_attributes(
           :slaves => %w[enp68s0f0 enp68s0f1 enp68s0f2 enp68s0f3]
         }
       },
-      :external_ipv4 => {
+      :external_he => {
         :interface => "bond0.101",
         :role => :external,
-        :family => :inet,
-        :address => "184.104.226.105"
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.226.105",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::9",
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1"
+        }
       },
-      :external_ipv6 => {
-        :interface => "bond0.101",
+      :external => {
+        :interface => "bond0.203",
         :role => :external,
-        :family => :inet6,
-        :address => "2001:470:1:b3b::9"
+        :metric => 150,
+        :source_route_table => 150,
+        :inet => {
+          :address => "87.252.214.105",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
+        },
+        :inet6 => {
+          :address => "2001:4d78:fe03:1c::9",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
+        }
       }
     }
   },
   :postgresql => {
     :settings => {
       :defaults => {
-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",
         :effective_cache_size => "16GB"
       }
     }
@@ -50,7 +68,7 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "12/main",
+      :cluster => "16/main",
       :postgis => "3"
     },
     :mapnik => "3.1",