1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
|
Description: Correctly report rabbitmq version
The output of "rabbitmqctl -q status" has changed between Buster and
Bullseye, confusing this puppet module. This fixes the problem. As the
version is now correctly detected, this puppet module can now correctly
use the --no-table-headers parameters for querying Rabbit.
Author: Thomas Goirand <zigo@debian.org>
Forwarded: https://github.com/voxpupuli/puppet-rabbitmq/pull/872
Last-Update: 2021-03-10
--- puppet-module-puppetlabs-rabbitmq-8.5.0.orig/lib/puppet/provider/rabbitmq_cli.rb
+++ puppet-module-puppetlabs-rabbitmq-8.5.0/lib/puppet/provider/rabbitmq_cli.rb
@@ -38,7 +38,7 @@
return @rabbitmq_version if defined? @rabbitmq_version
output = rabbitmqctl('-q', 'status')
- version = output.match(%r{\{rabbit,"RabbitMQ","([\d\.]+)"\}})
+ version = output.match(%r{(?:\{rabbit,"RabbitMQ","|RabbitMQ version: )([\d\.]+)})
@rabbitmq_version = version[1] if version
end
|