From 06c0e9809ad5774939b62d38edc009c0536d2a89 Mon Sep 17 00:00:00 2001 From: JJ Asghar Date: Fri, 17 Mar 2017 16:33:14 -0500 Subject: [PATCH 1/4] Fixes for rhel based pkgs - fixes for rhel based pkgs Signed-off-by: JJ Asghar --- attributes/default.rb | 13 ++++++++++++- metadata.rb | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index a24909d8..30628998 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -9,7 +9,18 @@ default['rabbitmq']['deb_package'] = "rabbitmq-server_#{node['rabbitmq']['version']}-1_all.deb" default['rabbitmq']['deb_package_url'] = "https://www.rabbitmq.com/releases/rabbitmq-server/v#{node['rabbitmq']['version']}/" -default['rabbitmq']['rpm_package'] = "rabbitmq-server-#{node['rabbitmq']['version']}-1.noarch.rpm" +case node['platform_family'] +when 'rhel', 'fedora' + case node['platform_version'] + when > '6' + default['rabbitmq']['rpm_package'] = "rabbitmq-server-#{node['rabbitmq']['version']}-1.el6..noarch.rpm" + when < '6' + default['rabbitmq']['rpm_package'] = "rabbitmq-server-#{node['rabbitmq']['version']}-1.el7.noarch.rpm" + end +when 'suse' + default['rabbitmq']['rpm_package'] = "rabbitmq-server-#{node['rabbitmq']['version']}-1.suse..noarch.rpm" +end + default['rabbitmq']['rpm_package_url'] = "https://www.rabbitmq.com/releases/rabbitmq-server/v#{node['rabbitmq']['version']}/" default['rabbitmq']['esl-erlang_package'] = 'esl-erlang-compat-R16B03-1.noarch.rpm?raw=true' diff --git a/metadata.rb b/metadata.rb index 922bf974..3da99533 100644 --- a/metadata.rb +++ b/metadata.rb @@ -3,7 +3,7 @@ maintainer_email 'jj@chef.io' license 'Apache 2.0' description 'Installs and configures RabbitMQ server' -version '4.11.0' +version '4.11.1' recipe 'rabbitmq', 'Install and configure RabbitMQ' recipe 'rabbitmq::cluster', 'Set up RabbitMQ clustering.' recipe 'rabbitmq::plugin_management', 'Manage plugins with node attributes' From 39bdae6bb1b395aff1c1350950378d2c5253df6c Mon Sep 17 00:00:00 2001 From: JJ Asghar Date: Fri, 17 Mar 2017 16:45:45 -0500 Subject: [PATCH 2/4] Typos and backwards Typos Signed-off-by: JJ Asghar --- attributes/default.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 30628998..1db71be4 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -12,13 +12,13 @@ case node['platform_family'] when 'rhel', 'fedora' case node['platform_version'] - when > '6' - default['rabbitmq']['rpm_package'] = "rabbitmq-server-#{node['rabbitmq']['version']}-1.el6..noarch.rpm" when < '6' + default['rabbitmq']['rpm_package'] = "rabbitmq-server-#{node['rabbitmq']['version']}-1.el6..noarch.rpm" + when > '6' default['rabbitmq']['rpm_package'] = "rabbitmq-server-#{node['rabbitmq']['version']}-1.el7.noarch.rpm" end when 'suse' - default['rabbitmq']['rpm_package'] = "rabbitmq-server-#{node['rabbitmq']['version']}-1.suse..noarch.rpm" + default['rabbitmq']['rpm_package'] = "rabbitmq-server-#{node['rabbitmq']['version']}-1.suse.noarch.rpm" end default['rabbitmq']['rpm_package_url'] = "https://www.rabbitmq.com/releases/rabbitmq-server/v#{node['rabbitmq']['version']}/" From a157914d9485cb609356de6b1d06bdf63d43f447 Mon Sep 17 00:00:00 2001 From: JJ Asghar Date: Fri, 17 Mar 2017 16:46:43 -0500 Subject: [PATCH 3/4] More typo . Signed-off-by: JJ Asghar --- attributes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attributes/default.rb b/attributes/default.rb index 1db71be4..1e8fa1d7 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -13,7 +13,7 @@ when 'rhel', 'fedora' case node['platform_version'] when < '6' - default['rabbitmq']['rpm_package'] = "rabbitmq-server-#{node['rabbitmq']['version']}-1.el6..noarch.rpm" + default['rabbitmq']['rpm_package'] = "rabbitmq-server-#{node['rabbitmq']['version']}-1.el6.noarch.rpm" when > '6' default['rabbitmq']['rpm_package'] = "rabbitmq-server-#{node['rabbitmq']['version']}-1.el7.noarch.rpm" end From f0620c962f40a75f1c61db2aa337a65b21f8add4 Mon Sep 17 00:00:00 2001 From: JJ Asghar Date: Fri, 17 Mar 2017 16:51:52 -0500 Subject: [PATCH 4/4] need to get version 6 missed = Signed-off-by: JJ Asghar --- attributes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attributes/default.rb b/attributes/default.rb index 1e8fa1d7..9d0812dc 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -12,7 +12,7 @@ case node['platform_family'] when 'rhel', 'fedora' case node['platform_version'] - when < '6' + when <= '6' default['rabbitmq']['rpm_package'] = "rabbitmq-server-#{node['rabbitmq']['version']}-1.el6.noarch.rpm" when > '6' default['rabbitmq']['rpm_package'] = "rabbitmq-server-#{node['rabbitmq']['version']}-1.el7.noarch.rpm"