chef-client 13.0.113 compatability fixes

.gitignore

@@ -9,7 +9,6 @@ Berksfile.lock
 /cookbooks
 
 # Bundler
-Gemfile.lock
 bin/*
 .bundle/*
 

attributes/default.rb

@@ -1,15 +1,15 @@
 # Use universal time if no other timezone is specified
-default.tz = value_for_platform_family(
+default['tz'] = value_for_platform_family(
   'debian'  => 'Etc/UTC',
   'default' => 'UTC'
 )
 
 # Path to tzdata directory
-default.timezone.tzdata_dir = '/usr/share/zoneinfo'
+default['timezone']['tzdata_dir'] = '/usr/share/zoneinfo'
 
 # Path to file used by kernel for local timezone's data
-default.timezone.localtime_path = '/etc/localtime'
+default['timezone']['localtime_path'] = '/etc/localtime'
 
 # Whether to use a symlink to tzdata (instead of copying).
 # Used only in the linux-default recipe.
-default.timezone.use_symlink = false
+default['timezone']['use_symlink'] = false

files/default/tests/minitest/default_test.rb

@@ -5,7 +5,7 @@ class TimezoneIiSpec < MiniTest::Chef::Spec
     describe_recipe 'timezone-ii::default' do
 
         it 'updates the timezone' do
-            IO.read('/etc/localtime').must_equal IO.read("/usr/share/zoneinfo/#{node[:tz]}")
+            IO.read('/etc/localtime').must_equal IO.read("/usr/share/zoneinfo/#{node['tz']}")
         end
 
     end

metadata.rb

@@ -1,19 +1,19 @@
-name             "timezone-ii"
-maintainer       "Lawrence Leonard Gilbert"
-maintainer_email "larry@L2G.to"
-license          "Apache 2.0"
-description      "Configure the system timezone on *ix systems"
-version          "0.2.9992"
+name 'timezone-ii'
+maintainer 'Lawrence Leonard Gilbert'
+maintainer_email 'larry@L2G.to'
+license 'Apache 2.0'
+description' Configure the system timezone on *ix systems'
+version '0.2.0'
 
-replaces         "timezone"
+replaces 'timezone'
 
-# These are platform versions where this cookbook has been tested at some point
-# in time
-supports "amazon"
-supports "centos"
-supports "debian"
-supports "fedora"
-supports "gentoo"
-supports "ubuntu"
-supports "pld"
-supports "redhat"
+# These are platform versions where this cookbook has been tested at some point in time
+
+%w(amazon centos debian fedora gentoo ubuntu pld redhat).each do |os|
+  supports os
+end
+
+source_url 'https://github.com/L2G/timezone-ii' if defined?(:source_url)
+issues_url 'https://github.com/L2G/timezone-ii/issues' if defined?(:issues_url)
+
+chef_version '>= 12.1' if respond_to?(:chef_version)

recipes/default.rb

@@ -15,37 +15,36 @@
   'default' => 'tzdata'
 )
 
-case node.platform_family
-when 'rhel'
-  include_recipe value_for_platform(
-    'amazon' => { 'default' => 'timezone-ii::amazon' },
-    'default' => 'timezone-ii::rhel'
-  )
+case node['platform_family']
+when 'rhel', 'fedora'
+  if node['platform_version'].split('.')[0].to_i >= 7
+    include_recipe 'timezone-ii::rhel7'
+  else
+    include_recipe 'timezone-ii::rhel'
+  end
 
-when 'debian', 'fedora', 'pld'
-  include_recipe "timezone-ii::#{node.platform_family}"
+when 'debian', 'pld', 'amazon'
+  include_recipe "timezone-ii::#{node['platform_family']}"
 
 else
-  if node.os == "linux"
+  if node['os'] == "linux"
     # Load the generic Linux recipe if there's no better known way to change the
     # timezone.  Log a warning (unless this is known to be the best way on a
     # particular platform).
-    message = "Linux platform '#{node.platform}' is unknown to this recipe; " +
+    message = "Linux platform '#{node['platform']}' is unknown to this recipe; " +
               "using generic Linux method"
     log message do
       level :warn
-      not_if { %w( centos gentoo rhel ).include? node.platform_family }
+      not_if { %w(centos gentoo rhel amazon).include? node['platform_family'] }
     end
 
     include_recipe 'timezone-ii::linux-generic'
 
   else
     message = "Don't know how to configure timezone for " +
-              "'#{node.platform_family}'!"
+              "'#{node['platform_family']}'!"
     log message do
       level :error
     end
-
-  end  # if/else node.os
-
-end  # case node.platform_family
+  end
+end

recipes/linux-generic.rb

@@ -10,8 +10,8 @@
 # Generic timezone-changing method for Linux that should work for any distro
 # without a platform-specific method.
 
-timezone_data_file = File.join(node.timezone.tzdata_dir, node.tz)
-localtime_path = node.timezone.localtime_path
+timezone_data_file = File.join(node['timezone']['tzdata_dir'], node['tz'])
+localtime_path = node['timezone']['localtime_path']
 
 ruby_block "confirm timezone" do
   block {
@@ -21,7 +21,7 @@
   }
 end
 
-if node.timezone.use_symlink
+if node['timezone']['use_symlink']
   link localtime_path do
     to timezone_data_file
     owner 'root'
@@ -41,4 +41,4 @@
                         " or set attribute ['timezone']['use_symlink']=true"
     }
   end
-end  # if/else node.timezone.use_symlink
+end

recipes/rhel.rb

@@ -14,24 +14,17 @@
 # If it is being run on EL 7 or newer, the recipe will be skipped and
 # the "rhel7" recipe will be included instead.
 
-el_version = node[:platform_version].split('.')[0].to_i
-
-if el_version >= 7
-  include_recipe 'timezone-ii::rhel7'
-
-else
-  template '/etc/sysconfig/clock' do
-    source 'clock.erb'
-    owner 'root'
-    group 'root'
-    mode 0644
-    notifies :run, 'execute[tzdata-update]'
-  end
+template '/etc/sysconfig/clock' do
+  source 'clock.erb'
+  owner 'root'
+  group 'root'
+  mode 0644
+  notifies :run, 'execute[tzdata-update]'
+end
 
-  execute 'tzdata-update' do
-    command '/usr/sbin/tzdata-update'
-    action :nothing
-    # Amazon Linux doesn't have this command!
-    only_if { ::File.executable?('/usr/sbin/tzdata-update') }
-  end
+execute 'tzdata-update' do
+  command '/usr/sbin/tzdata-update'
+  action :nothing
+  # Amazon Linux doesn't have this command!
+  only_if { ::File.executable?('/usr/sbin/tzdata-update') }
 end

recipes/rhel7.rb

@@ -8,4 +8,19 @@
 #
 
 # This sets the timezone on EL 7 distributions (e.g. RedHat and CentOS)
-execute "timedatectl --no-ask-password set-timezone #{node[:tz]}"
+execute "timedatectl --no-ask-password set-timezone #{node['tz']}"
+
+template '/etc/sysconfig/clock' do
+  source 'clock.erb'
+  owner 'root'
+  group 'root'
+  mode 0644
+  notifies :run, 'execute[tzdata-update]'
+end
+
+execute 'tzdata-update' do
+  command '/usr/sbin/tzdata-update'
+  action :nothing
+  # Amazon Linux doesn't have this command!
+  only_if { ::File.executable?('/usr/sbin/tzdata-update') }
+end

spec/attributes_spec.rb

@@ -6,20 +6,20 @@
       ChefSpec::SoloRunner.new(platform: 'debian', version: '7.4').converge('timezone-ii')
     end
 
-    specify { expect(chef_run.node[:tz])                       .to eq 'Etc/UTC' }
-    specify { expect(chef_run.node[:timezone][:tzdata_dir])    .to eq '/usr/share/zoneinfo' }
-    specify { expect(chef_run.node[:timezone][:localtime_path]).to eq '/etc/localtime' }
-    specify { expect(chef_run.node[:timezone][:use_symlink])   .to be_falsey }
+    specify { expect(chef_run.node['tz']).to eq 'Etc/UTC' }
+    specify { expect(chef_run.node['timezone']['tzdata_dir']).to eq '/usr/share/zoneinfo' }
+    specify { expect(chef_run.node['timezone']['localtime_path']).to eq '/etc/localtime' }
+    specify { expect(chef_run.node['timezone']['use_symlink']).to be_falsey }
   end
 
   context 'on non-Debian' do
     let(:chef_run) do
       ChefSpec::SoloRunner.new.converge('timezone-ii')
     end
 
-    specify { expect(chef_run.node[:tz])                       .to eq 'UTC' }
-    specify { expect(chef_run.node[:timezone][:tzdata_dir])    .to eq '/usr/share/zoneinfo' }
-    specify { expect(chef_run.node[:timezone][:localtime_path]).to eq '/etc/localtime' }
-    specify { expect(chef_run.node[:timezone][:use_symlink])   .to be_falsey }
+    specify { expect(chef_run.node['tz']).to eq 'UTC' }
+    specify { expect(chef_run.node['timezone']['tzdata_dir']).to eq '/usr/share/zoneinfo' }
+    specify { expect(chef_run.node['timezone']['localtime_path']).to eq '/etc/localtime' }
+    specify { expect(chef_run.node['timezone']['use_symlink']).to be_falsey }
   end
 end

templates/amazon/clock.erb

@@ -1 +1 @@
-ZONE="<%= node[:tz] %>"
+ZONE="<%= node['tz'] %>"

templates/centos/clock.erb

@@ -1 +1 @@
-ZONE="<%= node[:tz] %>"
+ZONE="<%= node['tz'] %>"

templates/default/timezone.conf.erb

@@ -1 +1 @@
-<%= node[:tz] %>
+<%= node['tz'] %>

templates/pld/timezone.conf.erb

@@ -7,4 +7,4 @@ ZONE_INFO_DIR="<%= node['timezone']['tzdata_dir'] %>"
 ZONE_INFO_SCHEME="posix"
 
 # Name of the time zone for your system.
-TIMEZONE="<%= node[:tz] %>"
+TIMEZONE="<%= node['tz'] %>"

templates/redhat/clock.erb

@@ -1 +1 @@
-ZONE="<%= node[:tz] %>"
+ZONE="<%= node['tz'] %>"