Drop last traces of old shorewall firewall zones

[chef.git] / roles / vhagar.rb

diff --git a/roles/vhagar.rb b/roles/vhagar.rb
index 75ca73bf01e544d977a48012c153b70bff7f514c..c8cd4a92fbf07dbe2c2e37aa2b83927114bc70e5 100644 (file)
--- a/roles/vhagar.rb
+++ b/roles/vhagar.rb
@@ -5,49 +5,41 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
   :networking => {
     :interfaces => {
       :internal => {

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

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

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

           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },

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

         :inet => {
         :inet => {

-          :address => "130.117.76.5",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
+          :address => "184.104.179.133"

         },
         :inet6 => {
         },
         :inet6 => {

-          :address => "2001:978:2:2c::172:5",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
+          :address => "2001:470:1:fa1::5"
+        }
+      },
+      :equinix => {
+        :inet => {
+          :address => "82.199.86.101"
+        },
+        :inet6 => {
+          :address => "2001:4d78:500:5e3::5"

         }
       }
     }
   },
   :nominatim => {
         }
       }
     }
   },
   :nominatim => {

-    :state => "standalone",
+    :dbcluster => "17/main",

     :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store",
     :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store",

-    :fpm_pools => {
-      "nominatim.openstreetmap.org" => {
-        :max_children => 200
-      }
-    }
+    :api_flavour => "python",
+    :api_workers => 24,
+    :api_pool_size => 8

   }
 )
 
 run_list(
   }
 )
 
 run_list(

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

   "role[nominatim]"
 )
   "role[nominatim]"
 )