Configure IPv6 on machines in Amsterdam

[chef.git] / roles / vhagar.rb

diff --git a/roles/vhagar.rb b/roles/vhagar.rb
index 304b212db76383d71f2720878e6f46c18ad9e375..b5776ab2ad41c8c79dca5add4e32b380e546da1a 100644 (file)
--- a/roles/vhagar.rb
+++ b/roles/vhagar.rb
@@ -17,26 +17,45 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },

+      :external_he => {
+        :interface => "bond0.3",
+        :role => :external,
+        :metric => 150,
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.179.133",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::5",
+          :prefix => 64,
+          :gateway => "2001:470:1:fa1::1"
+        }
+      },

       :external => {
       :external => {

-        :interface => "bond0.2",
+        :interface => "bond0.103",

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

+        :source_route_table => 150,

         :inet => {
         :inet => {

-          :address => "130.117.76.5"
+          :address => "82.199.86.101",
+          :prefix => "27",
+          :gateway => "82.199.86.97"

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

-          :address => "2001:978:2:2c::172:5"
+          :address => "2001:4d78:500:5e3::5",
+          :prefix => 64,
+          :gateway => "2001:4d78:500:5e3::1"

         }
       }
     }
   },
   :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

   }
 )
 
   }
 )