Skip to content

Commit cde0585

Browse files
committed
Enable Puppet 7 support
1 parent 63fee2c commit cde0585

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"requirements": [
5555
{
5656
"name": "puppet",
57-
"version_requirement": ">= 5.5.8 < 7.0.0"
57+
"version_requirement": ">= 5.5.8 < 8.0.0"
5858
}
5959
],
6060
"dependencies": [

spec/classes/rabbitmq_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
context 'with no pin', if: facts[:os]['family'] == 'Debian' do
7878
let(:params) { { repos_ensure: true, package_apt_pin: '' } }
7979

80-
if Puppet.version =~ %r{^6} # https://tickets.puppetlabs.com/browse/PUP-9112 and https://tickets.puppetlabs.com/browse/PUP-9180
80+
if Puppet.version =~ %r{^[6,7]} # https://tickets.puppetlabs.com/browse/PUP-9112 and https://tickets.puppetlabs.com/browse/PUP-9180
8181
let(:expected_key_apt_source_key_content) { 'nil' }
8282
else
8383
let(:expected_key_apt_source_key_content) { ':undef' }
@@ -97,7 +97,7 @@
9797
context 'with pin', if: facts[:os]['family'] == 'Debian' do
9898
let(:params) { { repos_ensure: true, package_apt_pin: '700' } }
9999

100-
if Puppet.version =~ %r{^6} # https://tickets.puppetlabs.com/browse/PUP-9112 and https://tickets.puppetlabs.com/browse/PUP-9180
100+
if Puppet.version =~ %r{^[6,7]} # https://tickets.puppetlabs.com/browse/PUP-9112 and https://tickets.puppetlabs.com/browse/PUP-9180
101101
let(:expected_key_apt_source_key_content) { 'nil' }
102102
else
103103
let(:expected_key_apt_source_key_content) { ':undef' }

0 commit comments

Comments
 (0)