imagery: increase randomise delay on mapserver restart

[chef.git] / roles / eddie.rb

diff --git a/roles/eddie.rb b/roles/eddie.rb
index eb6753f45af5e413e011661f300a0bbe44f8f669..61e4524557657c1214b2eeae51cba28679c20139 100644 (file)
--- a/roles/eddie.rb
+++ b/roles/eddie.rb
@@ -2,19 +2,14 @@ name "eddie"
 description "Master role applied to eddie"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
-  :db => {
-    :cluster => "9.5/main"
-  },
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "enp1s0f0.2801",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.0.10"
+        :inet => {
+          :address => "10.0.0.10"
+        }
       }
     }
   },
@@ -24,8 +19,7 @@ default_attributes(
         :shared_buffers => "64GB",
         :work_mem => "64MB",
         :maintenance_work_mem => "1GB",
-        :effective_cache_size => "180GB",
-        :effective_io_concurrency => "256"
+        :effective_cache_size => "180GB"
       }
     }
   },
@@ -37,23 +31,10 @@ default_attributes(
         "kernel.shmall" => 66 * 1024 * 1024 * 1024 / 4096
       }
     }
-  },
-  :sysfs => {
-    :md_tune => {
-      :comment => "Enable request merging for NVMe devices",
-      :parameters => {
-        "block/nvme0n1/queue/nomerges" => "1",
-        "block/nvme1n1/queue/nomerges" => "1",
-        "block/nvme2n1/queue/nomerges" => "1",
-        "block/nvme3n1/queue/nomerges" => "1",
-        "block/nvme4n1/queue/nomerges" => "1",
-        "block/nvme5n1/queue/nomerges" => "1",
-        "block/nvme6n1/queue/nomerges" => "1"
-      }
-    }
   }
 )
 
 run_list(
-  "role[ucl]"
+  "role[ucl]",
+  "role[db-slave]"
 )