(GH-1031) Oracle/Scientific Linux 6 Fix

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 004601b4afd6e44b381c3f46d8f3574e4e56b8fc..df7fde40f3fab2884870e60253a517934285400f 100644 (file)
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -14,7 +14,7 @@ describe 'firewall class' do
     idempotent_apply(pp)
   end
 
-  it 'ensure => stopped:' do
+  it 'ensure => stopped:', unless: os[:family] == 'redhat' && os[:release].to_i == 6 do
     pp = "class { 'firewall': ensure => stopped }"
     idempotent_apply(pp)
   end

diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
index 3f8295a909381eabd7f45056dd24d543b804ca83..8027ba0d445f0cdb7d0789f3e7d650b1c89ca39b 100644 (file)
--- a/spec/spec_helper_acceptance_local.rb
+++ b/spec/spec_helper_acceptance_local.rb
@@ -99,6 +99,10 @@ RSpec.configure do |c|
       LitmusHelper.instance.run_shell('update-alternatives --set iptables /usr/sbin/iptables-legacy', expect_failures: true)
       LitmusHelper.instance.run_shell('update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy', expect_failures: true)
     end
+    if ['oraclelinux-6', 'scientific-6'].include?("#{fetch_os_name}-#{os[:release].to_i}")
+      pp = "class { 'firewall': ensure => stopped }"
+      LitmusHelper.instance.apply_manifest(pp)
+    end
     pp = <<-PUPPETCODE
       package { 'conntrack-tools':
         ensure => 'latest',