Skip to content

Commit 3aff134

Browse files
author
Morgan Haskel
committed
Set obsoletes=0 on el7 to work around PUP-4497
1 parent 3d23958 commit 3aff134

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

spec/acceptance/mod_security_spec.rb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,18 @@
1818
pp = "class { 'epel': }"
1919
apply_manifest(pp, :catch_failures => true)
2020
end
21+
elsif fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7'
22+
it 'changes obsoletes, per PUP-4497' do
23+
pp = <<-EOS
24+
ini_setting { 'obsoletes':
25+
path => '/etc/yum.conf',
26+
section => 'main',
27+
setting => 'obsoletes',
28+
value => '0',
29+
}
30+
EOS
31+
apply_manifest(pp, :catch_failures => true)
32+
end
2133
end
2234

2335
it 'succeeds in puppeting mod_security' do

spec/spec_helper_acceptance.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
# Required for mod_passenger tests.
2222
if fact('osfamily') == 'RedHat'
2323
on host, puppet('module','install','stahnma/epel'), { :acceptable_exit_codes => [0,1] }
24+
on host, puppet('module','install','puppetlabs/inifile'), { :acceptable_exit_codes => [0,1] }
2425
end
2526
# Required for manifest to make mod_pagespeed repository available
2627
if fact('osfamily') == 'Debian'

0 commit comments

Comments
 (0)