Move openlayers out of openstreetmap-website

[chef.git] / roles / karm.rb

diff --git a/roles/karm.rb b/roles/karm.rb
index d9e604a52cf0b45f47c45e8662a5e5857d52132b..9490d64e9f5d443f1f668f950feb902a4a2a7eed 100644 (file)
--- a/roles/karm.rb
+++ b/roles/karm.rb
@@ -2,20 +2,16 @@ name "karm"
 description "Master role applied to karm"
 
 default_attributes(
 description "Master role applied to karm"
 
 default_attributes(

-  :apt => {
-    :sources => ["postgresql"]
-  },
-  :db => {
-    :cluster => "9.5/main"
-  },

   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {

-        :interface => "enp1s0f0",
+        :interface => "bond0",

         :role => :internal,
         :family => :inet,
         :role => :internal,
         :family => :inet,

-        :address => "146.179.159.168",
-        :hwaddress => "0c:c4:7a:a3:aa:ac"
+        :address => "10.0.48.50",
+        :bond => {
+          :slaves => %w[enp1s0f0 enp1s0f1 enp2s0f0 enp2s0f1]
+        }

       }
     }
   },
       }
     }
   },


@@ -25,10 +21,11 @@ default_attributes(
         :shared_buffers => "64GB",
         :work_mem => "64MB",
         :maintenance_work_mem => "1GB",
         :shared_buffers => "64GB",
         :work_mem => "64MB",
         :maintenance_work_mem => "1GB",

-        :effective_cache_size => "180GB"
+        :effective_cache_size => "180GB",
+        :effective_io_concurrency => "256",
+        :random_page_cost => "1.1"

       }
       }

-    },
-    :versions => ["9.5"]
+    }

   },
   :sysctl => {
     :postgres => {
   },
   :sysctl => {
     :postgres => {


@@ -38,23 +35,11 @@ default_attributes(
         "kernel.shmall" => 66 * 1024 * 1024 * 1024 / 4096
       }
     }
         "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"
-      }
-    }

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ic]",
-  "role[db-master]"
+  "role[equinix]",
+  "role[db-master]",
+  "role[db-backup]"

 )
 )