Update vendored cookbooks

sealuzh · Aug 16, 2018 · 6467716 · 6467716
1 parent 65b8f2d
commit 6467716
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/cookbooks/cwb-server/berks-cookbooks/cwb-server/attributes/default.rb b/cookbooks/cwb-server/berks-cookbooks/cwb-server/attributes/default.rb
@@ -102,7 +102,10 @@
 default['cwb-server']['chef']['server_url'] = "https://#{server_host}:443/organizations/#{organisation}"
 
 # Chef VM provisioning
-default['cwb-server']['chef']['omnibus_chef_version'] = '12.14.60'
+# Chef client versions: https://docs.chef.io/release_notes.html
+# Notice that CWB is currently not yet compatible with Chef 13 and 14
+# https://github.com/sealuzh/cwb-benchmarks/issues/20
+default['cwb-server']['chef']['omnibus_chef_version'] = '12.22.3'
 default['cwb-server']['chef']['provisioning_path'] = '/etc/chef'
 
 ## Providers

diff --git a/cookbooks/cwb-server/berks-cookbooks/cwb-server/recipes/deploy.rb b/cookbooks/cwb-server/berks-cookbooks/cwb-server/recipes/deploy.rb
@@ -196,5 +196,5 @@ def bundle(cmd, opts = {})
     end
   end
   # TODO: Think about graceful restart for currently running worker processes!
-  restart_command "sudo systemctl restart #{app['name']}.target"
+  restart_command "sudo systemctl daemon-reload && sudo systemctl restart #{app['name']}.target"
 end