Enable netplan for all Equinix machines

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 0684875df40d631656d664508c85862ab30dd31d..694c84f93d4674d197f39206455237d3aae10022 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -8,7 +8,7 @@ default_attributes(
         :interface => "bond0",
         :role => :internal,
         :family => :inet,
         :interface => "bond0",
         :role => :internal,
         :family => :inet,

-        :address => "10.0.48.1",
+        :address => "10.0.48.9",

         :bond => {
           :slaves => %w[p18p1 p18p2]
         }
         :bond => {
           :slaves => %w[p18p1 p18p2]
         }


@@ -28,7 +28,7 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

-    :versions => ["9.6"],
+    :versions => ["10"],

     :settings => {
       :defaults => {
         :work_mem => "300MB",
     :settings => {
       :defaults => {
         :work_mem => "300MB",


@@ -45,7 +45,8 @@ default_attributes(
     :enable_backup => false,
     :enable_git_updates => true,
     :dbadmins => %w[lonvia tomh],
     :enable_backup => false,
     :enable_git_updates => true,
     :dbadmins => %w[lonvia tomh],

-    :dbcluster => "9.6/main",
+    :dbcluster => "10/main",
+    :postgis => "2.4",

     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",
     :tablespaces => {
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",
     :tablespaces => {


@@ -73,6 +74,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ic]",
+  "role[equinix]",

   "role[nominatim]"
 )
   "role[nominatim]"
 )