Fix log rotation on web servers

[chef.git] / roles / karm.rb

diff --git a/roles/karm.rb b/roles/karm.rb
index d7d0d2a1e66b6076af6f10156a6437ac5368976a..ac28c48d4f3866a35e7880cb328dd2e9712feed4 100644 (file)
--- a/roles/karm.rb
+++ b/roles/karm.rb
@@ -2,21 +2,19 @@ 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 => {
   :networking => {
     :interfaces => {

-      :internal_ipv4 => {
+      :internal => {

         :interface => "bond0",
         :role => :internal,
         :interface => "bond0",
         :role => :internal,

-        :family => :inet,
-        :address => "10.0.48.50",
+        :inet => {
+          :address => "10.0.48.50"
+        },

         :bond => {
         :bond => {

-          :slaves => %w[enp1s0f0 enp1s0f1]
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[enp1s0f0 enp1s0f1 enp2s0f0 enp2s0f1]

         }
       }
     }
         }
       }
     }


@@ -27,9 +25,8 @@ 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_io_concurrency => "256",
-        :random_page_cost => "1.1"
+        :effective_cache_size => "180GB"
+

       }
     }
   },
       }
     }
   },


@@ -41,25 +38,10 @@ 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",
-        "block/nvme6n1/queue/nomerges" => "1",
-        "block/nvme7n1/queue/nomerges" => "1"
-      }
-    }

   }
 )
 
 run_list(
   }
 )
 
 run_list(

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

   "role[db-slave]"
 )
   "role[db-slave]"
 )