Drop last traces of old shorewall firewall zones

[chef.git] / roles / vhagar.rb

diff --git a/roles/vhagar.rb b/roles/vhagar.rb
index 97620c72a799032e256800a0d42981668078b32b..c8cd4a92fbf07dbe2c2e37aa2b83927114bc70e5 100644 (file)
--- a/roles/vhagar.rb
+++ b/roles/vhagar.rb
@@ -4,35 +4,42 @@ description "Master role applied to vhagar"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "bond0",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.5",
+      :internal => {
+        :inet => {
+          :address => "10.0.48.5"
+        },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external_ipv4 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet,
-        :address => "130.117.76.5"
+      :henet => {
+        :inet => {
+          :address => "184.104.179.133"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::5"
+        }
       },
-      :external_ipv6 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:5"
+      :equinix => {
+        :inet => {
+          :address => "82.199.86.101"
+        },
+        :inet6 => {
+          :address => "2001:4d78:500:5e3::5"
+        }
       }
     }
+  },
+  :nominatim => {
+    :dbcluster => "17/main",
+    :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store",
+    :api_flavour => "python",
+    :api_workers => 24,
+    :api_pool_size => 8
   }
 )
 
 run_list(
-  "role[equinix-ams]",
+  "role[equinix-ams-public]",
   "role[nominatim]"
 )