Merge remote-tracking branch 'github/pull/358' into master

[chef.git] / roles / sarel.rb

diff --git a/roles/sarel.rb b/roles/sarel.rb
index b535374d79d825c018bf9b9fe7b4c964fe3064a2..ab1bf393b259706a5a450e7336db8d71a1cb9cfb 100644 (file)
--- a/roles/sarel.rb
+++ b/roles/sarel.rb
@@ -2,21 +2,28 @@ name "sarel"
 description "Master role applied to sarel"
 
 default_attributes(
 description "Master role applied to sarel"
 
 default_attributes(

+  :apache => {
+    :mpm => "event",
+    :event => {
+      :min_spare_threads => 50,
+      :max_spare_threads => 150,
+      :listen_cores_buckets_ratio => 4
+    }
+  },

   :git => {
     :private_user => "chefrepo",
   :git => {
     :private_user => "chefrepo",

-    :private_group => "chefrepo",
-    :private_nodes => "fqdn:*"
+    :private_group => "chefrepo"

   },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {

-        :interface => "eth0.2801",
+        :interface => "enp3s0f0.2801",

         :role => :internal,
         :family => :inet,
         :address => "10.0.0.12"
       },
       :external_ipv4 => {
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.12"
       },
       :external_ipv4 => {

-        :interface => "eth0.2800",
+        :interface => "enp3s0f0.2800",

         :role => :external,
         :family => :inet,
         :address => "193.60.236.20"
         :role => :external,
         :family => :inet,
         :address => "193.60.236.20"


@@ -27,8 +34,6 @@ default_attributes(
 
 run_list(
   "role[ucl]",
 
 run_list(
   "role[ucl]",

-  "role[hp-g5]",
-  "role[yournavigation]",

   "role[chef-server]",
   "role[chef-repository]",
   "role[letsencrypt]",
   "role[chef-server]",
   "role[chef-repository]",
   "role[letsencrypt]",