From 649b9c23884a6534aa2f06c25aea4b15b53e20a5 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov Date: Sat, 18 Feb 2017 21:21:51 +0100 Subject: [PATCH 1/2] Fix compatibility with Chef Client 12.6.0 --- libraries/consul_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/consul_service.rb b/libraries/consul_service.rb index a4b10814..165de020 100644 --- a/libraries/consul_service.rb +++ b/libraries/consul_service.rb @@ -90,7 +90,7 @@ def service_options(service) service.options(:sysvinit, template: 'consul:sysvinit.service.erb') service.options(:upstart, template: 'consul:upstart.service.erb', executable: new_resource.program) - if platform_family?('rhel') && node['platform_version'].to_i == 6 + if node.platform_family?('rhel') && node['platform_version'].to_i == 6 service.provider(:sysvinit) end end From 977ae10f5e9dec05fae3dfaf96c1ed47097fd274 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov Date: Sat, 11 Mar 2017 20:49:54 +0100 Subject: [PATCH 2/2] Fix cook style offense regarding #format Favor format over String#% --- libraries/consul_installation_binary.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/consul_installation_binary.rb b/libraries/consul_installation_binary.rb index 2f2da5ce..c1252fdf 100644 --- a/libraries/consul_installation_binary.rb +++ b/libraries/consul_installation_binary.rb @@ -47,7 +47,7 @@ def action_create recursive true end - url = options[:archive_url] % { version: options[:version], basename: options[:archive_basename] } + url = format(options[:archive_url], version: options[:version], basename: options[:archive_basename]) poise_archive url do destination join_path(options[:extract_to], new_resource.version) source_properties checksum: options[:archive_checksum]