Merge pull request #1144 from mhaskel/7b_testing

Set obsoletes=0 on el7 to work around PUP-4497
redhat-openstack · Jun 19, 2015 · e267668 · e267668
2 parents 3d23958 + 3aff134
commit e267668
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/spec/acceptance/mod_security_spec.rb b/spec/acceptance/mod_security_spec.rb
@@ -18,6 +18,18 @@
         pp = "class { 'epel': }"
         apply_manifest(pp, :catch_failures => true)
       end
+    elsif fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7'
+      it 'changes obsoletes, per PUP-4497' do
+        pp = <<-EOS
+          ini_setting { 'obsoletes':
+            path    => '/etc/yum.conf',
+            section => 'main',
+            setting => 'obsoletes',
+            value   => '0',
+          }
+        EOS
+        apply_manifest(pp, :catch_failures => true)
+      end
     end
 
     it 'succeeds in puppeting mod_security' do

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -21,6 +21,7 @@
       # Required for mod_passenger tests.
       if fact('osfamily') == 'RedHat'
         on host, puppet('module','install','stahnma/epel'), { :acceptable_exit_codes => [0,1] }
+        on host, puppet('module','install','puppetlabs/inifile'), { :acceptable_exit_codes => [0,1] }
       end
       # Required for manifest to make mod_pagespeed repository available
       if fact('osfamily') == 'Debian'