meta-stx/recipes-support/puppet/files/puppetlabs-rabbitmq/0001-Roll-up-TIS-patches.patch

   1 From 6170b01db0dea2b58fc0f150704205f7aac82ab4 Mon Sep 17 00:00:00 2001
   2 From: Al Bailey <Al.Bailey@windriver.com>
   3 Date: Thu, 2 Nov 2017 09:22:58 -0500
   4 Subject: [PATCH 1/2] WRS: Patch1: 0001-Roll-up-TIS-patches.patch
   5
   6 ---
   7  lib/puppet/provider/rabbitmq_policy/rabbitmqctl.rb | 6 ++++++
   8  manifests/config.pp                                | 6 +++---
   9  manifests/init.pp                                  | 5 +++--
  10  manifests/install.pp                               | 4 +++-
  11  manifests/install/rabbitmqadmin.pp                 | 3 ++-
  12  manifests/params.pp                                | 1 +
  13  6 files changed, 18 insertions(+), 7 deletions(-)
  14
  15 diff --git a/lib/puppet/provider/rabbitmq_policy/rabbitmqctl.rb b/lib/puppet/provider/rabbitmq_policy/rabbitmqctl.rb
  16 index 7e73295..438d9cc 100644
  17 --- a/lib/puppet/provider/rabbitmq_policy/rabbitmqctl.rb
  18 +++ b/lib/puppet/provider/rabbitmq_policy/rabbitmqctl.rb
  19 @@ -95,6 +95,12 @@ Puppet::Type.type(:rabbitmq_policy).provide(:rabbitmqctl, :parent => Puppet::Pro
  20        resource[:definition] ||= definition
  21        resource[:pattern]    ||= pattern
  22        resource[:priority]   ||= priority
  23 +      # WRS. Values passed in from packstack are in string format. These need
  24 +      # to be converted back to integer for certain parameters (e.g. max-length,
  25 +      # expires)
  26 +      if (resource[:definition].keys & ["max-length", "expires"]).any?
  27 +       resource[:definition].each {|k,v| resource[:definition][k] = v.to_i}
  28 +      end
  29        # rabbitmq>=3.2.0
  30        if Puppet::Util::Package.versioncmp(self.class.rabbitmq_version, '3.2.0') >= 0
  31          rabbitmqctl('set_policy',
  32 diff --git a/manifests/config.pp b/manifests/config.pp
  33 index 6e1f7f5..66a8b08 100644
  34 --- a/manifests/config.pp
  35 +++ b/manifests/config.pp
  36 @@ -116,7 +116,7 @@ class rabbitmq::config {
  37      ensure => directory,
  38      owner  => '0',
  39      group  => '0',
  40 -    mode   => '0644',
  41 +    mode   => '0640',
  42    }
  43
  44    file { '/etc/rabbitmq/ssl':
  45 @@ -132,7 +132,7 @@ class rabbitmq::config {
  46      content => template($config),
  47      owner   => '0',
  48      group   => '0',
  49 -    mode    => '0644',
  50 +    mode    => '0640',
  51      notify  => Class['rabbitmq::service'],
  52    }
  53
  54 @@ -142,7 +142,7 @@ class rabbitmq::config {
  55      content => template($env_config),
  56      owner   => '0',
  57      group   => '0',
  58 -    mode    => '0644',
  59 +    mode    => '0640',
  60      notify  => Class['rabbitmq::service'],
  61    }
  62
  63 diff --git a/manifests/init.pp b/manifests/init.pp
  64 index 363c70d..3451599 100644
  65 --- a/manifests/init.pp
  66 +++ b/manifests/init.pp
  67 @@ -11,6 +11,7 @@ class rabbitmq(
  68    Hash $config_shovel_statics                    = $rabbitmq::params::config_shovel_statics,
  69    String $default_user                           = $rabbitmq::params::default_user,
  70    String $default_pass                           = $rabbitmq::params::default_pass,
  71 +  String $default_host                           = $rabbitmq::params::default_host,
  72    Boolean $delete_guest_user                     = $rabbitmq::params::delete_guest_user,
  73    String $env_config                             = $rabbitmq::params::env_config,
  74    Stdlib::Absolutepath $env_config_path          = $rabbitmq::params::env_config_path,
  75 @@ -186,7 +187,7 @@ class rabbitmq(
  76
  77      rabbitmq_plugin { 'rabbitmq_management':
  78        ensure   => present,
  79 -      require  => Class['rabbitmq::install'],
  80 +      require => [ File['/etc/rabbitmq'], Class['rabbitmq::install'] ],
  81        notify   => Class['rabbitmq::service'],
  82        provider => 'rabbitmqplugins',
  83      }
  84 @@ -206,7 +207,7 @@ class rabbitmq(
  85    if ($ldap_auth) {
  86      rabbitmq_plugin { 'rabbitmq_auth_backend_ldap':
  87        ensure  => present,
  88 -      require => Class['rabbitmq::install'],
  89 +      require => [ File['/etc/rabbitmq'], Class['rabbitmq::install'] ],
  90        notify  => Class['rabbitmq::service'],
  91      }
  92    }
  93 diff --git a/manifests/install.pp b/manifests/install.pp
  94 index 20ca090..45072c4 100644
  95 --- a/manifests/install.pp
  96 +++ b/manifests/install.pp
  97 @@ -11,7 +11,9 @@ class rabbitmq::install {
  98    package { 'rabbitmq-server':
  99      ensure   => $package_ensure,
 100      name     => $package_name,
 101 -    provider => $package_provider,
 102 +    # DPENNEY: For some reason, package_provider is coming out as yum.
 103 +    # Hardcode as rpm for now.
 104 +    provider => 'rpm',
 105      notify   => Class['rabbitmq::service'],
 106      require  => $package_require,
 107    }
 108 diff --git a/manifests/install/rabbitmqadmin.pp b/manifests/install/rabbitmqadmin.pp
 109 index e0ab7c7..9a3a8dd 100644
 110 --- a/manifests/install/rabbitmqadmin.pp
 111 +++ b/manifests/install/rabbitmqadmin.pp
 112 @@ -11,6 +11,7 @@ class rabbitmq::install::rabbitmqadmin {
 113
 114    $default_user = $rabbitmq::default_user
 115    $default_pass = $rabbitmq::default_pass
 116 +  $default_host = $rabbitmq::default_host
 117    $node_ip_address = $rabbitmq::node_ip_address
 118
 119    if $rabbitmq::node_ip_address == 'UNSET' {
 120 @@ -27,7 +28,7 @@ class rabbitmq::install::rabbitmqadmin {
 121
 122    staging::file { 'rabbitmqadmin':
 123      target      => "${rabbitmq::rabbitmq_home}/rabbitmqadmin",
 124 -    source      => "${protocol}://${default_user}:${default_pass}@${sanitized_ip}:${management_port}/cli/rabbitmqadmin",
 125 +    source      => "${protocol}://${default_user}:${default_pass}@${default_host}:${management_port}/cli/rabbitmqadmin",
 126      curl_option => "-k ${curl_prefix} --retry 30 --retry-delay 6",
 127      timeout     => '180',
 128      wget_option => '--no-proxy',
 129 diff --git a/manifests/params.pp b/manifests/params.pp
 130 index ffface9..da0d2b4 100644
 131 --- a/manifests/params.pp
 132 +++ b/manifests/params.pp
 133 @@ -87,6 +87,7 @@ class rabbitmq::params {
 134    $config_shovel_statics       = {}
 135    $default_user                = 'guest'
 136    $default_pass                = 'guest'
 137 +  $default_host               = 'localhost'
 138    $delete_guest_user           = false
 139    $env_config                  = 'rabbitmq/rabbitmq-env.conf.erb'
 140    $env_config_path             = '/etc/rabbitmq/rabbitmq-env.conf'
 141 --
 142 1.8.3.1
 143