From 46dfc4572aca4f5c82499afc1b48da640bcfebb5 Mon Sep 17 00:00:00 2001 From: Bradley Bishop Date: Mon, 1 Mar 2021 13:33:51 -0500 Subject: [PATCH 1/9] Added the lang and lc_all tags to the environment variables for rabbitmq_cli --- lib/puppet/provider/rabbitmq_cli.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/provider/rabbitmq_cli.rb b/lib/puppet/provider/rabbitmq_cli.rb index 2f3c97d43..90542d0d0 100644 --- a/lib/puppet/provider/rabbitmq_cli.rb +++ b/lib/puppet/provider/rabbitmq_cli.rb @@ -25,7 +25,7 @@ def self.append_to_path(dir) def self.home_tmp_command(name, path) has_command name, path do - environment HOME: '/tmp' + environment HOME: '/tmp', LANG: 'en_US.UTF-8', LC_ALL: 'en_US.UTF-8' end end From 200a093768370e726577653a509c4988bfcf411f Mon Sep 17 00:00:00 2001 From: Bradley Bishop Date: Fri, 5 Mar 2021 22:01:30 -0500 Subject: [PATCH 2/9] Added erlang repo --- manifests/repo/rhel.pp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/manifests/repo/rhel.pp b/manifests/repo/rhel.pp index 5000df38b..c6e986e8b 100644 --- a/manifests/repo/rhel.pp +++ b/manifests/repo/rhel.pp @@ -3,6 +3,7 @@ # @api private class rabbitmq::repo::rhel ( $location = "https://packagecloud.io/rabbitmq/rabbitmq-server/el/${facts['os'][release][major]}/\$basearch", + $erlang_location = "https://packagecloud.io/rabbitmq/erlang/el/${facts['os'][release][major]}/\$basearch", String $key_source = $rabbitmq::package_gpg_key, ) { yumrepo { 'rabbitmq': @@ -14,6 +15,15 @@ gpgcheck => 1, } + yumrepo { 'erlang': + ensure => present, + name => 'rabbitmq_erlang', + baseurl => $erlang_location, + gpgkey => $key_source, + enabled => 1, + gpgcheck => 1, + } + # This may still be needed to prevent warnings # packagecloud key is gpg-pubkey-d59097ab-52d46e88 exec { "rpm --import ${key_source}": From a484bb109173af6b2642e3289abe5bb23bfabe97 Mon Sep 17 00:00:00 2001 From: Bradley Bishop Date: Sat, 6 Mar 2021 13:45:21 -0500 Subject: [PATCH 3/9] Commenting out code for testing. --- manifests/repo/rhel.pp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/manifests/repo/rhel.pp b/manifests/repo/rhel.pp index c6e986e8b..5acbb1297 100644 --- a/manifests/repo/rhel.pp +++ b/manifests/repo/rhel.pp @@ -15,14 +15,14 @@ gpgcheck => 1, } - yumrepo { 'erlang': - ensure => present, - name => 'rabbitmq_erlang', - baseurl => $erlang_location, - gpgkey => $key_source, - enabled => 1, - gpgcheck => 1, - } + # yumrepo { 'erlang': + # ensure => present, + # name => 'rabbitmq_erlang', + # baseurl => $erlang_location, + # gpgkey => $key_source, + # enabled => 1, + # gpgcheck => 1, + # } # This may still be needed to prevent warnings # packagecloud key is gpg-pubkey-d59097ab-52d46e88 From 72cded332678db238a88ccf0175766895ac399e7 Mon Sep 17 00:00:00 2001 From: Bradley Bishop Date: Sat, 6 Mar 2021 14:13:25 -0500 Subject: [PATCH 4/9] Commented out code for testing. --- lib/puppet/provider/rabbitmq_cli.rb | 2 +- manifests/repo/rhel.pp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/puppet/provider/rabbitmq_cli.rb b/lib/puppet/provider/rabbitmq_cli.rb index fb003f8c2..bb2708282 100644 --- a/lib/puppet/provider/rabbitmq_cli.rb +++ b/lib/puppet/provider/rabbitmq_cli.rb @@ -25,7 +25,7 @@ def self.append_to_path(dir) def self.home_tmp_command(name, path) has_command name, path do - environment HOME: '/tmp', LANG: 'en_US.UTF-8', LC_ALL: 'en_US.UTF-8' + environment HOME: '/tmp' end end diff --git a/manifests/repo/rhel.pp b/manifests/repo/rhel.pp index 5acbb1297..2b80e7bb5 100644 --- a/manifests/repo/rhel.pp +++ b/manifests/repo/rhel.pp @@ -15,6 +15,8 @@ gpgcheck => 1, } + # This is required because when using the latest version of rabbitmq because the latest version in EPEL + # for Erlang is 22.0.7 which is not compatible: https://www.rabbitmq.com/which-erlang.html # yumrepo { 'erlang': # ensure => present, # name => 'rabbitmq_erlang', From a2515d4d64feb0869c45f263388107a34b2d7308 Mon Sep 17 00:00:00 2001 From: Bradley Bishop Date: Sat, 6 Mar 2021 14:31:07 -0500 Subject: [PATCH 5/9] Added Changelog and Updated version in metadata. Applied fixes and added comments. --- CHANGELOG.md | 6 ++++++ lib/puppet/provider/rabbitmq_cli.rb | 2 +- manifests/repo/rhel.pp | 16 ++++++++-------- metadata.json | 2 +- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33ea016ab..a684d2551 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. Each new release typically also includes the latest modulesync defaults. These should not affect the functionality of the module. + +## [v11.0.2](https://github.com/voxpupuli/puppet-rabbitmq/tree/v11.0.2) (2021-03-6) + + - Updated the environment to unclude LANG and LC_ALL vairables to fix issues with trying to run with the incorrect encoding + - Fixed issues with when managing repos the Erlang repo was not managed and the required version was not available in EPEL + ## [v11.0.0](https://github.com/voxpupuli/puppet-rabbitmq/tree/v11.0.0) (2021-01-16) [Full Changelog](https://github.com/voxpupuli/puppet-rabbitmq/compare/v10.3.0...v11.0.0) diff --git a/lib/puppet/provider/rabbitmq_cli.rb b/lib/puppet/provider/rabbitmq_cli.rb index bb2708282..fb003f8c2 100644 --- a/lib/puppet/provider/rabbitmq_cli.rb +++ b/lib/puppet/provider/rabbitmq_cli.rb @@ -25,7 +25,7 @@ def self.append_to_path(dir) def self.home_tmp_command(name, path) has_command name, path do - environment HOME: '/tmp' + environment HOME: '/tmp', LANG: 'en_US.UTF-8', LC_ALL: 'en_US.UTF-8' end end diff --git a/manifests/repo/rhel.pp b/manifests/repo/rhel.pp index 2b80e7bb5..fc1bfc28f 100644 --- a/manifests/repo/rhel.pp +++ b/manifests/repo/rhel.pp @@ -17,14 +17,14 @@ # This is required because when using the latest version of rabbitmq because the latest version in EPEL # for Erlang is 22.0.7 which is not compatible: https://www.rabbitmq.com/which-erlang.html - # yumrepo { 'erlang': - # ensure => present, - # name => 'rabbitmq_erlang', - # baseurl => $erlang_location, - # gpgkey => $key_source, - # enabled => 1, - # gpgcheck => 1, - # } + yumrepo { 'erlang': + ensure => present, + name => 'rabbitmq_erlang', + baseurl => $erlang_location, + gpgkey => $key_source, + enabled => 1, + gpgcheck => 1, + } # This may still be needed to prevent warnings # packagecloud key is gpg-pubkey-d59097ab-52d46e88 diff --git a/metadata.json b/metadata.json index 8d64a5cf6..fa6695530 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-rabbitmq", - "version": "11.0.1-rc0", + "version": "11.0.2-rc0", "author": "voxpupuli", "summary": "Installs, configures, and manages RabbitMQ.", "license": "Apache-2.0", From e8cb1d5e3c0809d6fe46f42c2adc3a63c81999d9 Mon Sep 17 00:00:00 2001 From: Bradley Bishop Date: Sat, 6 Mar 2021 17:14:41 -0500 Subject: [PATCH 6/9] Reverted changelog. --- CHANGELOG.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a684d2551..33ea016ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,6 @@ All notable changes to this project will be documented in this file. Each new release typically also includes the latest modulesync defaults. These should not affect the functionality of the module. - -## [v11.0.2](https://github.com/voxpupuli/puppet-rabbitmq/tree/v11.0.2) (2021-03-6) - - - Updated the environment to unclude LANG and LC_ALL vairables to fix issues with trying to run with the incorrect encoding - - Fixed issues with when managing repos the Erlang repo was not managed and the required version was not available in EPEL - ## [v11.0.0](https://github.com/voxpupuli/puppet-rabbitmq/tree/v11.0.0) (2021-01-16) [Full Changelog](https://github.com/voxpupuli/puppet-rabbitmq/compare/v10.3.0...v11.0.0) From b7b8ef8fb5110399bcb80b46842f450b107ebf13 Mon Sep 17 00:00:00 2001 From: Bradley Bishop Date: Mon, 8 Mar 2021 13:11:32 -0500 Subject: [PATCH 7/9] Removed unneeded environment vaiable. --- lib/puppet/provider/rabbitmq_cli.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/provider/rabbitmq_cli.rb b/lib/puppet/provider/rabbitmq_cli.rb index fb003f8c2..2a663f873 100644 --- a/lib/puppet/provider/rabbitmq_cli.rb +++ b/lib/puppet/provider/rabbitmq_cli.rb @@ -25,7 +25,7 @@ def self.append_to_path(dir) def self.home_tmp_command(name, path) has_command name, path do - environment HOME: '/tmp', LANG: 'en_US.UTF-8', LC_ALL: 'en_US.UTF-8' + environment HOME: '/tmp', LC_ALL: 'en_US.UTF-8' end end From 7cf44425ab14ade65fefdc73743732ad681fdf8e Mon Sep 17 00:00:00 2001 From: Bradley Bishop Date: Mon, 8 Mar 2021 13:16:37 -0500 Subject: [PATCH 8/9] reverting erlang module add --- manifests/repo/rhel.pp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/manifests/repo/rhel.pp b/manifests/repo/rhel.pp index fc1bfc28f..5000df38b 100644 --- a/manifests/repo/rhel.pp +++ b/manifests/repo/rhel.pp @@ -3,7 +3,6 @@ # @api private class rabbitmq::repo::rhel ( $location = "https://packagecloud.io/rabbitmq/rabbitmq-server/el/${facts['os'][release][major]}/\$basearch", - $erlang_location = "https://packagecloud.io/rabbitmq/erlang/el/${facts['os'][release][major]}/\$basearch", String $key_source = $rabbitmq::package_gpg_key, ) { yumrepo { 'rabbitmq': @@ -15,17 +14,6 @@ gpgcheck => 1, } - # This is required because when using the latest version of rabbitmq because the latest version in EPEL - # for Erlang is 22.0.7 which is not compatible: https://www.rabbitmq.com/which-erlang.html - yumrepo { 'erlang': - ensure => present, - name => 'rabbitmq_erlang', - baseurl => $erlang_location, - gpgkey => $key_source, - enabled => 1, - gpgcheck => 1, - } - # This may still be needed to prevent warnings # packagecloud key is gpg-pubkey-d59097ab-52d46e88 exec { "rpm --import ${key_source}": From a0b068c0d987687e8482df5bfdd04e6b83f35a67 Mon Sep 17 00:00:00 2001 From: Bradley Bishop Date: Tue, 16 Mar 2021 15:46:18 -0400 Subject: [PATCH 9/9] Removed new tag from metadata --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index fa6695530..8d64a5cf6 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-rabbitmq", - "version": "11.0.2-rc0", + "version": "11.0.1-rc0", "author": "voxpupuli", "summary": "Installs, configures, and manages RabbitMQ.", "license": "Apache-2.0",