meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-rabbitmq/0004-Partially-revert-upstream-commit-f7c3a4a637d59f3065d.patch

   1 From 5c8fa2301ee9fa92267ff351e3fa3e59f2b2df79 Mon Sep 17 00:00:00 2001
   2 From: Al Bailey <Al.Bailey@windriver.com>
   3 Date: Wed, 24 Jan 2018 16:01:48 -0600
   4 Subject: [PATCH] Partially revert upstream commit
   5  f7c3a4a637d59f3065d8129e9ebacba992dfc469
   6
   7 Upstream converted the code based on rabbitmqctl 3.6.10 changes
   8 We are using 3.6.5  but hopefully this expression will match both
   9
  10 Status of node rabbit@localhost ...
  11 or
  12 Status of node rabbit@localhost
  13 ---
  14  lib/facter/rabbitmq_nodename.rb | 2 +-
  15  1 file changed, 1 insertion(+), 1 deletion(-)
  16
  17 diff --git a/lib/facter/rabbitmq_nodename.rb b/lib/facter/rabbitmq_nodename.rb
  18 index 301e3c1..d5c6352 100644
  19 --- a/lib/facter/rabbitmq_nodename.rb
  20 +++ b/lib/facter/rabbitmq_nodename.rb
  21 @@ -2,7 +2,7 @@ Facter.add(:rabbitmq_nodename) do
  22    setcode do
  23      if Facter::Core::Execution.which('rabbitmqctl')
  24        rabbitmq_nodename = Facter::Core::Execution.execute('rabbitmqctl status 2>&1')
  25 -      %r{^Status of node '?([\w\.]+@[\w\.\-]+)'?}.match(rabbitmq_nodename)[1]
  26 +      %r{^Status of node '?([\w\.]+@[\w\.\-]+)'?( \.+)?$}.match(rabbitmq_nodename)[1]
  27      end
  28    end
  29  end
  30 --
  31 1.8.3.1
  32