blog: merge in opengeodata redirects

[chef.git] / roles / culebre.rb

diff --git a/roles/culebre.rb b/roles/culebre.rb
index 20a4d2c793f8b697cc6ec9f9e123213efa6426f8..c956e456c93958393aea30a4de278f2f33b369f3 100644 (file)
--- a/roles/culebre.rb
+++ b/roles/culebre.rb
@@ -4,26 +4,28 @@ description "Master role applied to culebre"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

-      :internal_ipv4 => {
+      :internal => {

         :interface => "bond0",
         :role => :internal,
         :interface => "bond0",
         :role => :internal,

-        :family => :inet,
-        :address => "10.0.64.9",
+        :inet => {
+          :address => "10.0.64.9"
+        },

         :bond => {
         :bond => {

-          :slaves => %w[eno1 eno2]
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[enp68s0f0 enp68s0f1 enp68s0f2 enp68s0f3]

         }
       },
         }
       },

-      :external_ipv4 => {
-        :interface => "bond0.2",
+      :external => {
+        :interface => "bond0.101",

         :role => :external,
         :role => :external,

-        :family => :inet,
-        :address => "184.104.226.105"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:470:1:b3b::9"
+        :inet => {
+          :address => "184.104.226.105"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::9"
+        }

       }
     }
   },
       }
     }
   },


@@ -47,7 +49,7 @@ default_attributes(
   },
   :tile => {
     :database => {
   },
   :tile => {
     :database => {

-      :cluster => "12/main",
+      :cluster => "14/main",

       :postgis => "3"
     },
     :mapnik => "3.1",
       :postgis => "3"
     },
     :mapnik => "3.1",