Fix issues reported by new rubocop

[chef.git] / cookbooks / chef / recipes / default.rb

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index f601031abe4a6f0bd07a57dcfa90528836dd70de..2d9dc4fe0f2c1f1561848416b2643e4d512dccf1 100644 (file)
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -52,13 +52,6 @@ dpkg_package "chef" do
   version node[:chef][:client][:version]
 end
 
-template "/etc/init/chef-client.conf" do
-  source "chef-client.conf.erb"
-  owner "root"
-  group "root"
-  mode 0644
-end
-
 directory "/etc/chef" do
   owner "root"
   group "root"
@@ -117,12 +110,38 @@ directory "/var/log/chef" do
   mode 0755
 end
 
-service "chef-client" do
-  provider Chef::Provider::Service::Upstart
-  action [:enable, :start]
-  supports :status => true, :restart => true, :reload => true
-  subscribes :restart, "dpkg_package[chef]"
-  subscribes :restart, "template[/etc/init/chef-client.conf]"
-  subscribes :restart, "template[/etc/chef/client.rb]"
-  subscribes :restart, "template[/etc/chef/report.rb]"
+if node[:lsb][:release].to_f >= 15.10
+  systemd_service "chef-client" do
+    description "Chef client"
+    after "network.target"
+    exec_start "/usr/bin/chef-client -i 1800 -s 20"
+    restart "on-failure"
+  end
+
+  service "chef-client" do
+    provider Chef::Provider::Service::Systemd
+    action [:enable, :start]
+    supports :status => true, :restart => true, :reload => true
+    subscribes :restart, "dpkg_package[chef]"
+    subscribes :restart, "systemd_service[chef-client]"
+    subscribes :restart, "template[/etc/chef/client.rb]"
+    subscribes :restart, "template[/etc/chef/report.rb]"
+  end
+else
+  template "/etc/init/chef-client.conf" do
+    source "chef-client.conf.erb"
+    owner "root"
+    group "root"
+    mode 0644
+  end
+
+  service "chef-client" do
+    provider Chef::Provider::Service::Upstart
+    action [:enable, :start]
+    supports :status => true, :restart => true, :reload => true
+    subscribes :restart, "dpkg_package[chef]"
+    subscribes :restart, "template[/etc/init/chef-client.conf]"
+    subscribes :restart, "template[/etc/chef/client.rb]"
+    subscribes :restart, "template[/etc/chef/report.rb]"
+  end
 end