Drop last traces of old shorewall firewall zones

[chef.git] / roles / culebre.rb

diff --git a/roles/culebre.rb b/roles/culebre.rb
index 9058b44459fe31b29b858e23a8a9d4d6a58f46c9..8f266566a93071ae12b55c70fbb50c437e06da03 100644 (file)
--- a/roles/culebre.rb
+++ b/roles/culebre.rb
@@ -5,27 +5,28 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
   :networking => {
     :interfaces => {
       :internal => {

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

         :inet => {
           :address => "10.0.64.9"
         },
         :bond => {
         :inet => {
           :address => "10.0.64.9"
         },
         :bond => {

-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",

           :slaves => %w[enp68s0f0 enp68s0f1 enp68s0f2 enp68s0f3]
         }
       },
           :slaves => %w[enp68s0f0 enp68s0f1 enp68s0f2 enp68s0f3]
         }
       },

-      :external => {
-        :interface => "bond0.101",
-        :role => :external,
+      :henet => {

         :inet => {
           :address => "184.104.226.105"
         },
         :inet6 => {
           :address => "2001:470:1:b3b::9"
         }
         :inet => {
           :address => "184.104.226.105"
         },
         :inet6 => {
           :address => "2001:470:1:b3b::9"
         }

+      },
+      :equinix => {
+        :inet => {
+          :address => "87.252.214.105"
+        },
+        :inet6 => {
+          :address => "2001:4d78:fe03:1c::9"
+        }

       }
     }
   },
       }
     }
   },


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

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

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


@@ -62,6 +63,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[equinix-dub]",
+  "role[equinix-dub-public]",

   "role[tile]"
 )
   "role[tile]"
 )