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

[chef.git] / roles / vhagar.rb

diff --git a/roles/vhagar.rb b/roles/vhagar.rb
index c18fd14411652fe7549631acd3507328ad7e5011..ab538a2ed656a18159893599153a4b3f50c70852 100644 (file)
--- a/roles/vhagar.rb
+++ b/roles/vhagar.rb
@@ -17,50 +17,24 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
-        :inet => {
-          :address => "130.117.76.5",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
-        },
-        :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" }
-          }
-        }
-      },
       :external => {
         :interface => "bond0.3",
         :role => :external,
-        :source_route_table => 150,
         :inet => {
-          :address => "184.104.179.133",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.133"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::5",
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::5"
         }
       }
     }
   },
   :nominatim => {
-    :state => "standalone",
+    :dbcluster => "17/main",
     :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
   }
 )