Limit columns selected from mysql user table to those we need

[chef.git] / roles / karm.rb

diff --git a/roles/karm.rb b/roles/karm.rb
index d7d0d2a1e66b6076af6f10156a6437ac5368976a..9490d64e9f5d443f1f668f950feb902a4a2a7eed 100644 (file)
--- a/roles/karm.rb
+++ b/roles/karm.rb
@@ -2,12 +2,6 @@ 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 => {


@@ -16,7 +10,7 @@ default_attributes(
         :family => :inet,
         :address => "10.0.48.50",
         :bond => {
         :family => :inet,
         :address => "10.0.48.50",
         :bond => {

-          :slaves => %w[enp1s0f0 enp1s0f1]
+          :slaves => %w[enp1s0f0 enp1s0f1 enp2s0f0 enp2s0f1]

         }
       }
     }
         }
       }
     }


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

   }
 )
 
 run_list(
   "role[equinix]",
   }
 )
 
 run_list(
   "role[equinix]",

-  "role[db-slave]"
+  "role[db-master]",
+  "role[db-backup]"

 )
 )