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

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 420522c593d99f348cb2533ba7a0b063f79860b1..622b44653c105ccc323777254c9cd1584eb5b692 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -17,14 +17,35 @@ default_attributes(
           :slaves => %w[enp1s0f0 enp1s0f1]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.3",
         :role => :external,
+        :metric => 150,
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.179.137",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::9",
+          :prefix => 64,
+          :gateway => "2001:470:1:fa1::1"
+        }
+      },
+      :external => {
+        :interface => "bond0.103",
+        :role => :external,
+        :source_route_table => 150,
         :inet => {
-          :address => "184.104.179.137"
+          :address => "82.199.86.105",
+          :prefix => "27",
+          :gateway => "82.199.86.97"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::9"
+          :address => "2001:4d78:500:5e3::9",
+          :prefix => 64,
+          :gateway => "2001:4d78:500:5e3::1"
         }
       }
     }
@@ -41,7 +62,7 @@ default_attributes(
   :nominatim => {
     :dbcluster => "17/main",
     :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store",
-    :enable_qa_tiles => true,
+    :enable_qa_tiles => false,
     :api_workers => 14,
     :api_pool_size => 10
   }