From 37b38295b22b0e4ae16f6fa917e774c8859143ee Mon Sep 17 00:00:00 2001 From: david22swan Date: Thu, 31 Mar 2022 14:57:56 +0100 Subject: [PATCH] (GH-1031) Oracle/Scientific Linux 6 Fix --- spec/acceptance/class_spec.rb | 2 +- spec/spec_helper_acceptance_local.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb index 004601b..df7fde4 100644 --- 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 3f8295a..8027ba0 100644 --- 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', -- 2.45.2