civicrm version bump

[chef.git] / roles / eddie.rb

diff --git a/roles/eddie.rb b/roles/eddie.rb
index 4ff628fff74454352a9d3241980e2b67aa97fef5..319be0b9d7a5e3405c33d206a57d9126b2f529c8 100644 (file)
--- a/roles/eddie.rb
+++ b/roles/eddie.rb
@@ -2,19 +2,14 @@ name "eddie"
 description "Master role applied to eddie"
 
 default_attributes(
 description "Master role applied to eddie"
 
 default_attributes(

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

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

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

         :interface => "enp1s0f0.2801",
         :role => :internal,
         :interface => "enp1s0f0.2801",
         :role => :internal,

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

       }
     }
   },
       }
     }
   },


@@ -38,26 +33,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(
   "role[ucl]",
   }
 )
 
 run_list(
   "role[ucl]",

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

 )
 )