diff --git a/lib/puppet/provider/rabbitmq_cli.rb b/lib/puppet/provider/rabbitmq_cli.rb index ff0067c8e..2f3c97d43 100644 --- a/lib/puppet/provider/rabbitmq_cli.rb +++ b/lib/puppet/provider/rabbitmq_cli.rb @@ -38,13 +38,14 @@ def self.rabbitmq_version return @rabbitmq_version if defined? @rabbitmq_version output = rabbitmqctl('-q', 'status') - version = output.match(%r{\{rabbit,"RabbitMQ","([\d\.]+)"\}}) + version = output.match(%r{RabbitMQ.*?([\d\.]+)}) @rabbitmq_version = version[1] if version end def self.rabbitmqctl_list(resource, *opts) + version = rabbitmq_version list_opts = - if Puppet::Util::Package.versioncmp(rabbitmq_version, '3.7.9') >= 0 + if version && Puppet::Util::Package.versioncmp(version, '3.7.9') >= 0 ['-q', '--no-table-headers'] else ['-q']