Merge remote-tracking branch 'github/pull/705'

[chef.git] / roles / vhagar.rb

diff --git a/roles/vhagar.rb b/roles/vhagar.rb
index 75ca73bf01e544d977a48012c153b70bff7f514c..fc482f3418e6feb41a3cac6d0e39afe746115d2f 100644 (file)
--- a/roles/vhagar.rb
+++ b/roles/vhagar.rb
@@ -18,32 +18,24 @@ default_attributes(
         }
       },
       :external => {
         }
       },
       :external => {

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

         :role => :external,
         :inet => {
         :role => :external,
         :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"

         }
       }
     }
   },
   :nominatim => {
     :state => "standalone",
         }
       }
     }
   },
   :nominatim => {
     :state => "standalone",

+    :dbcluster => "15/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

   }
 )
 
   }
 )