Update rabbitmq to 654f343

654f343 Merge pull request #304 from raphink/dev/unscoped_template_vars
a7809a2 Fix unscoped template variables
9c40d7f Merge pull request #301 from dalees/bug/enable-ssl-versions-2
ae66ee8 Updating rspec tests for ssl_version changes, whitespace and rabbitmq_management version block
4dcfdf5 Bugfix for ssl_versions in rabbitmq.config so Erlang/RabbitMQ respect them.
c47a8be Merge pull request redhat-openstack#298 from syseleven/MODULES-1691
f2b79c9 SSL option in rabbitmqadmin.conf is broken
5280e66 Merge pull request redhat-openstack#297 from bogdando/fix_MODULES-1673
177e3e9 Merge pull request redhat-openstack#296 from jtopjian/enable-ssl-versions-2
bbac274 Fix rabbitmq-env.conf parameters
5675b38 Revised SSL versions documentation
35bb069 Added ssl_versions parameter
52d3557 Merge pull request redhat-openstack#295 from sodabrew/patch-1
384892a Merge pull request redhat-openstack#294 from bogdando/fix_MODULES-1650
b39952a Merge pull request redhat-openstack#293 from deltaroe/master
e8dbe8d Merge pull request redhat-openstack#292 from bogdando/fix3_MODULES_1452
ac67949 Merge pull request redhat-openstack#290 from jtopjian/fix-pin-conditional
da9c7a8 Merge pull request redhat-openstack#287 from erhudy/master
4657e57 Merge pull request redhat-openstack#269 from Mayflower/master
d37c9ab Idiomatic syntax for should_policy and should_vhost
966e0b5 Add retries for non transient file transfer errors
cf30101 Merge pull request redhat-openstack#289 from bogdando/fix-MODULES-1631
0813f47 Merge pull request redhat-openstack#288 from blkperl/fix_cluster_docs
0be89ec Documentation update for ssl_only
9b23a90 Make rabbitmq providers to retry the commands
f530a5f Fix pin conditional
ced14e7 Do not enforce the source value for yum provider
da99e16 Update cluster example to include required parameters
247b6e0 - moved the parenthesis before map to the end so that the map works on   the array and then the set is created from that, instead of map   coercing the set to an array, which breaks things that call Set#add - switching back to the previous more concise expression form
e709ba7 my first set of changes for the user tag idempotence issue
1cc2e54 Merge pull request redhat-openstack#286 from cmurphy/release
aaab4f4 Prepare 5.0.0 release
cfd3d2b Merge pull request redhat-openstack#285 from cmurphy/rm_27
bdf9453 Merge pull request redhat-openstack#284 from cmurphy/remove_deprecations
931a6d4 Stop claiming to support Puppet 2.7.
a2f802c Add documentation for the new resources
d998f94 Add new resource rabbitmq_binding
ebc20c2 Add new resource rabbitmq_queue
0c061fb Remove deprecated parameters
fd13a5a Merge pull request redhat-openstack#282 from cmurphy/cookie
7a8951d Update README
780b638 Stop setting a default cookie
5c485b8 Replace erlang cookie fact with type and provider
04145c1 Merge pull request redhat-openstack#281 from cmurphy/alternative_253
cf5d62f Merge pull request redhat-openstack#283 from cmurphy/ldap
d6411ac Put rabbitmqadmin.conf in /etc/rabbitmq
5aea1f1 create /tmp/.rabbitmqadmin.conf
3bb4d15 Fix lint errors in ldap_user_dn_example parameter
ac046ee Merge pull request redhat-openstack#280 from cmurphy/ssl
26a74ae Merge pull request redhat-openstack#263 from cmurphy/update_travis
2ece861 Installation of the rabbitmqadmin script fails when SSL is enabled. This is fixed by using ::ssl_management_port when SSL is enabled.
325de42 Merge pull request redhat-openstack#266 from nibalizer/beaker_vhost
3741e86 Merge pull request #2 from cmurphy/fix_266
43906f5 Improve rabbitmq type acceptance tests
f7306ff Merge pull request redhat-openstack#276 from cmurphy/version
e1aab42 Merge pull request redhat-openstack#275 from cmurphy/change_password
edd56fb Merge pull request redhat-openstack#270 from cmurphy/disk-disc
c56f338 (MODULES-636) Allow version to be user-defined
ed96902 Merge pull request redhat-openstack#246 from mhamrah/master
6c67f33 (MODULES-1186) Allow disk as a valid cluster node type
ecd4120 Fixes for redhat-openstack#218
1f11596 Validate user paswwords per run
ecd7447 Merge pull request redhat-openstack#209 from queeno/ensure_apt_source
be96585 Merge pull request redhat-openstack#274 from cmurphy/fix_travisci
81dae07 Separate system and unit test gems
7671f32 Merge pull request redhat-openstack#260 from spuder/patch-1
0050361 Updates README with epel dependency Issue redhat-openstack#260
8086d73 Added rspec tests/$manage_repo backward compatible
dac9d75 Beaker tests for vhost and policy
54fdab4 Introduced backward compatibility for $manage_repos
a5879f4 Rename variable 'manage_repos' to 'repos_ensure'
da24604 Added rspec tests for previous commit 4dad6be
34412d1 rabbitmq::manage_repos sets 'ensure' in apt::source
00f6472 Merge pull request redhat-openstack#268 from nibalizer/lint_checks
d371edd Lint now fails on warnings, rocketships aligned
f7b1f33 Merge pull request redhat-openstack#254 from misterdorm/pluginparsing
3ff4dd1 Merge pull request redhat-openstack#245 from ArloL/patch-1
50b9411 Merge pull request redhat-openstack#239 from mattymo/gpgkeycheck
ae876f6 Merge pull request redhat-openstack#235 from cyberious/master
983a2aa Merge pull request redhat-openstack#233 from michalskalski/master
f8b9936 Merge pull request redhat-openstack#228 from jmoseley/style_fix
40af5f0 Merge pull request redhat-openstack#225 from alphagov/strip-backslashes
e2e70a7 Merge pull request redhat-openstack#212 from tayzlor/fix-curl-wget-proxy-localhost
53adb36 Merge pull request redhat-openstack#265 from nibalizer/docs_fix
7d14bac Docs fixes
11b72f8 Merge pull request redhat-openstack#264 from nibalizer/remove_comments
e654d81 Merge pull request redhat-openstack#262 from mgagne/rabbitmq_policy
20518b1 Remove comments referencing redmine and anchors
4ffdb44 Add rabbitmq_policy custom type
9181065 Stop testing on 2.7.0
92031d6 Merge pull request redhat-openstack#261 from cmurphy/master
cf6457f Fix spec tests
c6d8aac Adds clarification that epel is required
a53e0c2 Merge pull request redhat-openstack#256 from laurenrother/summary
112d87b Merge pull request redhat-openstack#259 from nibalizer/longer_keyid
945ad58 Use 16char keyid for rabbit repo
a6a98e4 Remove trailing whitespace
7bddb61 Use shorter URL for RabbitMQ documentation
3e0496f Strip backslashes from the output of rabbitmqctl
0bdf72e Add metadata summary per FM-1523
d262edb Use -m flag on rabbitmq-plugins command for managing rabbitmq_plugin resources
61991d7 Merge pull request redhat-openstack#251 from nibalizer/fix_340
66ffaaf Merge pull request #1 from cmurphy/fix_fix_340
87d39e8 Update unit tests to handle new -q flag
7adb318 Use -q flag instead of array slices
a6b2f80 passing tests
835fc66 use rpm for RedHat family
c7a1cbb Output cacertfile value only if it is set
15ec284 Optimize check for RHEL GPG key
4d2d931 Remove puppet_module_install in favor of copy_module_to
69fcc9b Make curl and wget not go via a proxy (if one is configured) for installation of the rabbitmq admin CLI
b377b82 Use warning instead of notify when inform about deprecation.
1f87d17 Fix style for puppet-lint failures.

Signed-off-by: Gael Chamoulaud <[email protected]>

Puppetfile

@@ -143,7 +143,7 @@ mod 'qpid',
   :git => 'https://github.com/dprince/puppet-qpid'
 
 mod 'rabbitmq',
-  :commit => '4832bd61b5b1bfea7c9cc985508e65cd10081652',
+  :commit => '654f3433aaa3c7abaebb0fb2c4574e1ce5da0fcb',
   :git => 'https://github.com/puppetlabs/puppetlabs-rabbitmq.git'
 
 mod 'redis',

rabbitmq/.travis.yml

@@ -1,14 +1,10 @@
 ---
 language: ruby
-bundler_args: --without development
+bundler_args: --without system_tests
 script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
   - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 2.0.0

rabbitmq/CHANGELOG → rabbitmq/CHANGELOG.md

@@ -1,18 +1,72 @@
-2014-08-20 - Version 4.1.0
-
-Summary:
+## 2014-12-22 - Version 5.0.0
+
+### Summary
+
+This release fixes a longstanding security issue where the rabbitmq
+erlang cookie was exposed as a fact by managing the cookie with a
+provider. It also drops support for Puppet 2.7, adds many features
+and fixes several bugs.
+
+#### Backwards-incompatible Changes
+
+- Removed the rabbitmq_erlang_cookie fact and replaced the logic to
+  manage that cookie with a provider.
+- Dropped official support for Puppet 2.7 (EOL 9/30/2014
+  https://groups.google.com/forum/#!topic/puppet-users/QLguMcLraLE )
+- Changed the default value of $rabbitmq::params::ldap_user_dn_pattern
+  to not contain a variable
+- Removed deprecated parameters: $rabbitmq::cluster_disk_nodes,
+  $rabbitmq::server::manage_service, and
+  $rabbitmq::server::config_mirrored_queues
+
+#### Features
+
+- Add tcp_keepalive parameter to enable TCP keepalive
+- Use https to download rabbitmqadmin tool when $rabbitmq::ssl is true
+- Add key_content parameter for offline Debian package installations
+- Use 16 character apt key to avoid potential collisions
+- Add rabbitmq_policy type, including support for rabbitmq <3.2.0
+- Add rabbitmq::ensure_repo parameter
+- Add ability to change rabbitmq_user password
+- Allow disk as a valid cluster node type
+
+#### Bugfixes
+
+- Avoid attempting to install rabbitmqadmin via a proxy (since it is
+  downloaded from localhost)
+- Optimize check for RHEL GPG key
+- Configure ssl_listener in stomp only if using ssl
+- Use rpm as default package provider for RedHat, bringing the module in
+  line with the documented instructions to manage erlang separately and allowing
+  the default version and source parameters to become meaningful
+- Configure cacertfile only if verify_none is not set
+- Use -q flag for rabbitmqctl commands to avoid parsing inconsistent
+  debug output
+- Use the -m flag for rabbitmqplugins commands, again to avoid parsing
+  inconsistent debug output
+- Strip backslashes from the rabbitmqctl output to avoid parsing issues
+- Fix limitation where version parameter was ignored
+- Add /etc/rabbitmq/rabbitmqadmin.conf to fix rabbitmqadmin port usage
+  when ssl is on
+- Fix linter errors and warnings
+- Add, update, and fix tests
+- Update docs
+
+## 2014-08-20 - Version 4.1.0
+
+### Summary
 
 This release adds several new features, fixes bugs, and improves tests and
 documentation.
 
-Features:
+#### Features
 - Autorequire the rabbitmq-server service in the rabbitmq_vhost type
 - Add credentials to rabbitmqadmin URL
 - Added $ssl_only parameter to rabbitmq, rabbitmq::params, and
 rabbitmq::config
 - Added property tags to rabbitmq_user provider
 
-Bugfixes:
+#### Bugfixes
 - Fix erroneous commas in rabbitmq::config
 - Use correct ensure value for the rabbitmq_stomp rabbitmq_plugin
 - Set HOME env variable to nil when leveraging rabbitmq to remove type error
@@ -22,18 +76,18 @@ from Python script
 - Allow LDAP auth configuration without configuring stomp
 - Added missing $ssl_verify and $ssl_fail_if_no_peer_cert to rabbitmq::config
 
-2014-05-16 - Version 4.0.0
+## 2014-05-16 - Version 4.0.0
 
-Summary:
+### Summary
 
 This release includes many new features and bug fixes.  With the exception of
 erlang management this should be backwards compatible with 3.1.0.
 
-Backwards-incompatible Changes:
+#### Backwards-incompatible Changes
 - erlang_manage was removed.  You will need to manage erlang separately. See
 the README for more information on how to configure this.
 
-Features:
+#### Features
 - Improved SSL support
 - Add LDAP support
 - Add ability to manage RabbitMQ repositories
@@ -45,7 +99,7 @@ Features:
 - Allow empty permission fields
 - Convert existing system tests to beaker acceptance tests.
 
-Bugfixes:
+#### Bugfixes
 - exchanges no longer recreated on each puppet run if non-default vhost is used
 - Allow port to be UNSET
 - Re-added rabbitmq::server class
@@ -59,40 +113,43 @@ Bugfixes:
   rabbitmq::install
 
 
-2013-09-14 - Version 3.1.0
+## 2013-09-14 - Version 3.1.0
 
-Summary:
+### Summary
 
 This release focuses on a few small (but critical) bugfixes as well as extends
 the amount of custom RabbitMQ configuration you can do with the module.
 
-Features:
+#### Features
 - You can now change RabbitMQ 'Config Variables' via the parameter `config_variables`.
 - You can now change RabbitMQ 'Environment Variables' via the parameter `environment_variables`.
 - ArchLinux support added.
 
-Fixes:
+#### Fixes
 - Make use of the user/password parameters in rabbitmq_exchange{}
 - Correct the read/write parameter order on set_permissions/list_permissions as
   they were reversed.
 - Make the module pull down 3.1.5 by default.
 
-* 2013-07-18 3.0.0
-Summary:
+## 2013-07-18 3.0.0
+
+### Summary
+
 This release heavily refactors the RabbitMQ and changes functionality in
 several key ways.  Please pay attention to the new README.md file for
 details of how to interact with the class now.  Puppet 3 and RHEL are
 now fully supported.  The default version of RabbitMQ has changed to
 a 3.x release.
 
-Bugfixes:
+#### Bugfixes
+
 - Improve travis testing options.
 - Stop reimporting the GPG key on every run on RHEL and Debian.
 - Fix documentation to make it clear you don't have to set provider => each time.
 - Reference the standard rabbitmq port in the documentation instead of a custom port.
 - Fixes to the README formatting.
 
-Features:
+#### Features
 - Refactor the module to fix RHEL support.  All interaction with the module
 is now done through the main rabbitmq class.
 - Add support for mirrored queues (Only on Debian family distributions currently)
@@ -101,39 +158,41 @@ is now done through the main rabbitmq class.
   - `manage_service`: Boolean to choose if Puppet should manage the service. (For pacemaker/HA setups)
 - Add SuSE support.
 
-Incompatible Changes:
+#### Incompatible Changes
+
 - Rabbitmq::server has been removed and is now rabbitmq::config.  You should
 not use this class directly, only via the main rabbitmq class.
 
-* 2013-04-11 2.1.0
+## 2013-04-11 2.1.0
+
 - remove puppetversion from rabbitmq.config template
 - add cluster support
 - escape resource names in regexp
 
-* 2012-07-31 Jeff McCune <[email protected]> 2.0.2
+## 2012-07-31 Jeff McCune <[email protected]> 2.0.2
 - Re-release 2.0.1 with $EDITOR droppings cleaned up
 
-* 2012-05-03 2.0.0
+## 2012-05-03 2.0.0
 - added support for new-style admin users
 - added support for rabbitmq 2.7.1
 
-* 2011-06-14 Dan Bode <[email protected]> 2.0.0rc1
+## 2011-06-14 Dan Bode <[email protected]> 2.0.0rc1
 - Massive refactor:
 - added native types for user/vhost/user_permissions
 - added apt support for vendor packages
 - added smoke tests
 
-* 2011-04-08 Jeff McCune <[email protected]> 1.0.4
+## 2011-04-08 Jeff McCune <[email protected]> 1.0.4
 - Update module for RabbitMQ 2.4.1 and rabbitmq-plugin-stomp package.
 
-2011-03-24 1.0.3
+## 2011-03-24 1.0.3
 - Initial release to the forge.  Reviewed by Cody.  Whitespace is good.
 
-2011-03-22 1.0.2
+## 2011-03-22 1.0.2
 - Whitespace only fix again...  ack '\t' is my friend...
 
-2011-03-22 1.0.1
+## 2011-03-22 1.0.1
 - Whitespace only fix.
 
-2011-03-22 1.0.0
+## 2011-03-22 1.0.0
 - Initial Release.  Manage the package, file and service.

rabbitmq/Gemfile

@@ -1,14 +1,18 @@
-source 'https://rubygems.org'
+source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
-group :development, :test do
-  gem 'rake', '10.1.1',          :require => false
-  gem 'rspec-puppet', '>=1.0.0', :require => false
+group :development, :unit_tests do
+  gem 'rake',                    :require => false
+  gem 'rspec-puppet',            :require => false
   gem 'puppetlabs_spec_helper',  :require => false
   gem 'puppet-lint',             :require => false
-  gem 'serverspec',              :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-  gem 'pry',                     :require => false
+  gem 'simplecov',               :require => false
+  gem 'puppet_facts',            :require => false
+  gem 'json',                    :require => false
+end
+
+group :system_tests do
+  gem 'beaker-rspec',  :require => false
+  gem 'serverspec',    :require => false
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']