Merge pull request #1334 from skazi0/chef-splay-attribute

provisioner: Make chef splay configurable

chef/cookbooks/provisioner/recipes/base.rb

@@ -211,13 +211,15 @@
 config_file = "/etc/sysconfig/chef-client"
 
 chef_client_runs = node[:provisioner][:chef_client_runs] || 900
+chef_splay = node[:provisioner][:chef_splay] || 20
 
 template config_file do
   owner "root"
   group "root"
   mode "0644"
   source "chef_client.erb"
   variables(
+    chef_splay: chef_splay,
     chef_client_runs: chef_client_runs
   )
   notifies :restart, "service[chef-client]", :delayed

chef/cookbooks/provisioner/templates/default/chef_client.erb

@@ -1,4 +1,4 @@
 LOGFILE=/var/log/chef/client.log
 CONFIG=/etc/chef/client.rb
 INTERVAL=<%= @chef_client_runs %>
-SPLAY=20
+SPLAY=<%= @chef_splay %>

chef/data_bags/crowbar/migrate/provisioner/201_chef_splay.rb

@@ -0,0 +1,9 @@
+def upgrade(ta, td, a, d)
+  a["chef_splay"] = ta["chef_splay"] unless a.key? "chef_splay"
+  return a, d
+end
+
+def downgrade(ta, td, a, d)
+  a.delete("chef_splay")
+  return a, d
+end

chef/data_bags/crowbar/template-provisioner.json

@@ -215,14 +215,15 @@
           "debug": "debug"
         }
       },
+      "chef_splay": 20,
       "chef_client_runs": 900
     }
   },
   "deployment": {
     "provisioner": {
       "crowbar-revision": 0,
       "crowbar-applied": false,
-      "schema-revision": 200,
+      "schema-revision": 201,
       "element_states": {
         "provisioner-server": [ "readying", "ready", "applying" ],
         "provisioner-base": [ "hardware-installing", "readying", "ready", "applying" ]

chef/data_bags/crowbar/template-provisioner.schema

@@ -104,6 +104,7 @@
                 }
               }
             },
+            "chef_splay": { "type": "int", "required": true },
             "chef_client_runs": { "type": "int", "required": true }
           }
         }