Updates for rubocop and foodcritic changes

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

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index bbd9750f5e40fa67333226b5dc04f9a620a06e12..a49813ae1c5cdcd62b097e0237ec8ea2ad124f7a 100644 (file)
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -17,9 +17,11 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-chef_gem "pony"
+chef_gem "pony" do
+  compile_time false
+end

 
 

-chef_package = "chef_#{node[:chef][:client][:version]}.ubuntu.11.04_amd64.deb"
+chef_package = "chef_#{node[:chef][:client][:version]}_amd64.deb"

 
 directory "/var/cache/chef" do
   owner "root"
 
 directory "/var/cache/chef" do
   owner "root"


@@ -27,22 +29,22 @@ directory "/var/cache/chef" do
   mode 0755
 end
 
   mode 0755
 end
 

-Dir.glob("/var/cache/chef/chef_*.ubuntu.11.04_amd64.deb").each do |deb|
-  if deb != "/var/cache/chef/#{chef_package}"
-    file deb do
-      action :delete
-      backup false
-    end
+Dir.glob("/var/cache/chef/chef_*.deb").each do |deb|
+  next if deb == "/var/cache/chef/#{chef_package}"
+
+  file deb do
+    action :delete
+    backup false

   end
 end
 
 remote_file "/var/cache/chef/#{chef_package}" do
   end
 end
 
 remote_file "/var/cache/chef/#{chef_package}" do

-  action :create_if_missing
-  source "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/11.04/x86_64/#{chef_package}"
+  source "https://packages.chef.io/stable/ubuntu/10.04/#{chef_package}"

   owner "root"
   group "root"
   mode 0644
   backup false
   owner "root"
   group "root"
   mode 0644
   backup false

+  ignore_failure true

 end
 
 dpkg_package "chef" do
 end
 
 dpkg_package "chef" do


@@ -50,11 +52,10 @@ dpkg_package "chef" do
   version node[:chef][:client][:version]
 end
 
   version node[:chef][:client][:version]
 end
 

-template "/etc/init/chef-client.conf" do
-  source "chef-client.conf.erb"
+directory "/etc/chef" do

   owner "root"
   group "root"
   owner "root"
   group "root"

-  mode 0644
+  mode 0755

 end
 
 template "/etc/chef/client.rb" do
 end
 
 template "/etc/chef/client.rb" do


@@ -84,7 +85,20 @@ template "/etc/logrotate.d/chef" do
   mode 0644
 end
 
   mode 0644
 end
 

-directory "/etc/chef/ohai" do
+directory "/etc/chef/trusted_certs" do
+  owner "root"
+  group "root"
+  mode 0755
+end
+
+template "/etc/chef/trusted_certs/verisign.pem" do
+  source "verisign.pem.erb"
+  owner "root"
+  group "root"
+  mode 0644
+end
+
+directory node[:ohai][:plugin_dir] do

   owner "root"
   group "root"
   mode 0755
   owner "root"
   group "root"
   mode 0755


@@ -96,12 +110,38 @@ directory "/var/log/chef" do
   mode 0755
 end
 
   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
 end