From aac359af8dfc2ebc902a0ae244be4edd573e41b1 Mon Sep 17 00:00:00 2001 From: Eimhin Laverty Date: Wed, 17 Apr 2019 13:24:31 +0100 Subject: [PATCH] (MODULES-8930) Fix stahnma/epel dependency failures (#364) --- spec/spec_helper_acceptance.rb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 2efb1cb5..27cb63cc 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -77,7 +77,17 @@ def retry_on_error_matching(max_retry_count = MAX_RETRY_COUNT, retry_wait_interv package { 'socat': ensure => present, } package { 'screen': ensure => present, } if $::osfamily == 'RedHat' { - class { 'epel': before => Package['socat'], } + if $::operatingsystemmajrelease == '5' or ($::operatingsystem == 'OracleLinux' and $::operatingsystemmajrelease == '6'){ + class { 'epel': + epel_baseurl => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all", + epel_mirrorlist => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all", + before => Package['socat'], + } + } else { + class { 'epel': + before => Package['socat'], + } + } service { 'iptables': ensure => stopped, } exec { 'setenforce 0': path => ['/bin','/usr/bin','/sbin','/usr/sbin'],