+++ /dev/null
-From 6170b01db0dea2b58fc0f150704205f7aac82ab4 Mon Sep 17 00:00:00 2001
-From: Al Bailey <Al.Bailey@windriver.com>
-Date: Thu, 2 Nov 2017 09:22:58 -0500
-Subject: [PATCH 1/2] WRS: Patch1: 0001-Roll-up-TIS-patches.patch
-
----
- lib/puppet/provider/rabbitmq_policy/rabbitmqctl.rb | 6 ++++++
- manifests/config.pp | 6 +++---
- manifests/init.pp | 5 +++--
- manifests/install.pp | 4 +++-
- manifests/install/rabbitmqadmin.pp | 3 ++-
- manifests/params.pp | 1 +
- 6 files changed, 18 insertions(+), 7 deletions(-)
-
-diff --git a/lib/puppet/provider/rabbitmq_policy/rabbitmqctl.rb b/lib/puppet/provider/rabbitmq_policy/rabbitmqctl.rb
-index 7e73295..438d9cc 100644
---- a/lib/puppet/provider/rabbitmq_policy/rabbitmqctl.rb
-+++ b/lib/puppet/provider/rabbitmq_policy/rabbitmqctl.rb
-@@ -95,6 +95,12 @@ Puppet::Type.type(:rabbitmq_policy).provide(:rabbitmqctl, :parent => Puppet::Pro
- resource[:definition] ||= definition
- resource[:pattern] ||= pattern
- resource[:priority] ||= priority
-+ # WRS. Values passed in from packstack are in string format. These need
-+ # to be converted back to integer for certain parameters (e.g. max-length,
-+ # expires)
-+ if (resource[:definition].keys & ["max-length", "expires"]).any?
-+ resource[:definition].each {|k,v| resource[:definition][k] = v.to_i}
-+ end
- # rabbitmq>=3.2.0
- if Puppet::Util::Package.versioncmp(self.class.rabbitmq_version, '3.2.0') >= 0
- rabbitmqctl('set_policy',
-diff --git a/manifests/config.pp b/manifests/config.pp
-index 6e1f7f5..66a8b08 100644
---- a/manifests/config.pp
-+++ b/manifests/config.pp
-@@ -116,7 +116,7 @@ class rabbitmq::config {
- ensure => directory,
- owner => '0',
- group => '0',
-- mode => '0644',
-+ mode => '0640',
- }
-
- file { '/etc/rabbitmq/ssl':
-@@ -132,7 +132,7 @@ class rabbitmq::config {
- content => template($config),
- owner => '0',
- group => '0',
-- mode => '0644',
-+ mode => '0640',
- notify => Class['rabbitmq::service'],
- }
-
-@@ -142,7 +142,7 @@ class rabbitmq::config {
- content => template($env_config),
- owner => '0',
- group => '0',
-- mode => '0644',
-+ mode => '0640',
- notify => Class['rabbitmq::service'],
- }
-
-diff --git a/manifests/init.pp b/manifests/init.pp
-index 363c70d..3451599 100644
---- a/manifests/init.pp
-+++ b/manifests/init.pp
-@@ -11,6 +11,7 @@ class rabbitmq(
- Hash $config_shovel_statics = $rabbitmq::params::config_shovel_statics,
- String $default_user = $rabbitmq::params::default_user,
- String $default_pass = $rabbitmq::params::default_pass,
-+ String $default_host = $rabbitmq::params::default_host,
- Boolean $delete_guest_user = $rabbitmq::params::delete_guest_user,
- String $env_config = $rabbitmq::params::env_config,
- Stdlib::Absolutepath $env_config_path = $rabbitmq::params::env_config_path,
-@@ -186,7 +187,7 @@ class rabbitmq(
-
- rabbitmq_plugin { 'rabbitmq_management':
- ensure => present,
-- require => Class['rabbitmq::install'],
-+ require => [ File['/etc/rabbitmq'], Class['rabbitmq::install'] ],
- notify => Class['rabbitmq::service'],
- provider => 'rabbitmqplugins',
- }
-@@ -206,7 +207,7 @@ class rabbitmq(
- if ($ldap_auth) {
- rabbitmq_plugin { 'rabbitmq_auth_backend_ldap':
- ensure => present,
-- require => Class['rabbitmq::install'],
-+ require => [ File['/etc/rabbitmq'], Class['rabbitmq::install'] ],
- notify => Class['rabbitmq::service'],
- }
- }
-diff --git a/manifests/install.pp b/manifests/install.pp
-index 20ca090..45072c4 100644
---- a/manifests/install.pp
-+++ b/manifests/install.pp
-@@ -11,7 +11,9 @@ class rabbitmq::install {
- package { 'rabbitmq-server':
- ensure => $package_ensure,
- name => $package_name,
-- provider => $package_provider,
-+ # DPENNEY: For some reason, package_provider is coming out as yum.
-+ # Hardcode as rpm for now.
-+ provider => 'rpm',
- notify => Class['rabbitmq::service'],
- require => $package_require,
- }
-diff --git a/manifests/install/rabbitmqadmin.pp b/manifests/install/rabbitmqadmin.pp
-index e0ab7c7..9a3a8dd 100644
---- a/manifests/install/rabbitmqadmin.pp
-+++ b/manifests/install/rabbitmqadmin.pp
-@@ -11,6 +11,7 @@ class rabbitmq::install::rabbitmqadmin {
-
- $default_user = $rabbitmq::default_user
- $default_pass = $rabbitmq::default_pass
-+ $default_host = $rabbitmq::default_host
- $node_ip_address = $rabbitmq::node_ip_address
-
- if $rabbitmq::node_ip_address == 'UNSET' {
-@@ -27,7 +28,7 @@ class rabbitmq::install::rabbitmqadmin {
-
- staging::file { 'rabbitmqadmin':
- target => "${rabbitmq::rabbitmq_home}/rabbitmqadmin",
-- source => "${protocol}://${default_user}:${default_pass}@${sanitized_ip}:${management_port}/cli/rabbitmqadmin",
-+ source => "${protocol}://${default_user}:${default_pass}@${default_host}:${management_port}/cli/rabbitmqadmin",
- curl_option => "-k ${curl_prefix} --retry 30 --retry-delay 6",
- timeout => '180',
- wget_option => '--no-proxy',
-diff --git a/manifests/params.pp b/manifests/params.pp
-index ffface9..da0d2b4 100644
---- a/manifests/params.pp
-+++ b/manifests/params.pp
-@@ -87,6 +87,7 @@ class rabbitmq::params {
- $config_shovel_statics = {}
- $default_user = 'guest'
- $default_pass = 'guest'
-+ $default_host = 'localhost'
- $delete_guest_user = false
- $env_config = 'rabbitmq/rabbitmq-env.conf.erb'
- $env_config_path = '/etc/rabbitmq/rabbitmq-env.conf'
---
-1.8.3.1
-
+++ /dev/null
-From 02c56be5340b079797fdb9944e1e048f1c3a18b7 Mon Sep 17 00:00:00 2001
-From: Al Bailey <Al.Bailey@windriver.com>
-Date: Fri, 2 Feb 2018 12:30:22 -0600
-Subject: [PATCH] Remove the rabbitmq_nodename fact
-
-This fact will not work on a standby node. it requires a drbd folder in order
-for rabbitmqctl status to work.
----
- lib/facter/rabbitmq_nodename.rb | 8 ------
- spec/unit/rabbitmq_nodename_spec.rb | 50 -------------------------------------
- 2 files changed, 58 deletions(-)
- delete mode 100644 lib/facter/rabbitmq_nodename.rb
- delete mode 100644 spec/unit/rabbitmq_nodename_spec.rb
-
-diff --git a/lib/facter/rabbitmq_nodename.rb b/lib/facter/rabbitmq_nodename.rb
-deleted file mode 100644
-index 2ee7926..0000000
---- a/lib/facter/rabbitmq_nodename.rb
-+++ /dev/null
-@@ -1,8 +0,0 @@
--Facter.add(:rabbitmq_nodename) do
-- setcode do
-- if Facter::Core::Execution.which('rabbitmqctl')
-- rabbitmq_nodename = Facter::Core::Execution.execute('rabbitmqctl status 2>&1')
-- %r{^Status of node '?([\w\.]+@[\w\.\-]+)'?( \.+)?$}.match(rabbitmq_nodename)[1]
-- end
-- end
--end
-diff --git a/spec/unit/rabbitmq_nodename_spec.rb b/spec/unit/rabbitmq_nodename_spec.rb
-deleted file mode 100644
-index 621d7eb..0000000
---- a/spec/unit/rabbitmq_nodename_spec.rb
-+++ /dev/null
-@@ -1,50 +0,0 @@
--require "spec_helper"
--
--describe Facter::Util::Fact do
-- before {
-- Facter.clear
-- }
--
-- describe "rabbitmq_nodename" do
-- context 'with value' do
-- before :each do
-- Facter::Core::Execution.stubs(:which).with('rabbitmqctl').returns(true)
-- Facter::Core::Execution.stubs(:execute).with('rabbitmqctl status 2>&1').returns('Status of node monty@rabbit1 ...')
-- end
-- it {
-- expect(Facter.fact(:rabbitmq_nodename).value).to eq('monty@rabbit1')
-- }
-- end
--
-- context 'with dashes in hostname' do
-- before :each do
-- Facter::Core::Execution.stubs(:which).with('rabbitmqctl').returns(true)
-- Facter::Core::Execution.stubs(:execute).with('rabbitmqctl status 2>&1').returns('Status of node monty@rabbit-1 ...')
-- end
-- it {
-- expect(Facter.fact(:rabbitmq_nodename).value).to eq('monty@rabbit-1')
-- }
-- end
--
-- context 'with quotes around node name' do
-- before :each do
-- Facter::Core::Execution.stubs(:which).with('rabbitmqctl').returns(true)
-- Facter::Core::Execution.stubs(:execute).with('rabbitmqctl status 2>&1').returns('Status of node \'monty@rabbit-1\' ...')
-- end
-- it {
-- expect(Facter.fact(:rabbitmq_nodename).value).to eq('monty@rabbit-1')
-- }
-- end
--
-- context 'without trailing points' do
-- before :each do
-- Facter::Core::Execution.stubs(:which).with('rabbitmqctl').returns(true)
-- Facter::Core::Execution.stubs(:execute).with('rabbitmqctl status 2>&1').returns('Status of node monty@rabbit-1')
-- end
-- it {
-- expect(Facter.fact(:rabbitmq_nodename).value).to eq('monty@rabbit-1')
-- }
-- end
--
-- end
--end
---
-1.8.3.1
-
Code Review / pti / rtp.git / commitdiff