Fedora: pre-install iptables to work-around dependency issue

As described in the comment, we need to pre-install the iptables
package before the iptables-service package to avoid dependency
issues.  This was causing F25 build failures.

Change-Id: I9541a1c8f11566198b6fa622e36c4be59d6670d2
This commit is contained in:
Ian Wienand 2016-12-19 10:52:09 +11:00
parent d921031e8a
commit 0b5f1ebeaf
1 changed files with 15 additions and 0 deletions

View File

@ -20,6 +20,21 @@ class iptables(
include ::iptables::params
# This is to work-around rhbz#1327786 ; the iptables-service package
# incorrectly "provides" an old iptables version and confuses rpm,
# making it uninstallable (this was apparently done as part of a
# package-split). Pre-installing the iptables instead of leaving it
# up to the dependency resolver works-around this.
# 2016-12-20 : fixed in iptables-1.6.0-3.fc26 so we can remove this
# when we've moved past F25
if $::operatingsystem == 'Fedora' {
package { 'iptables-actual':
ensure => present,
name => 'iptables',
before => Package['iptables']
}
}
package { 'iptables':
ensure => present,
name => $::iptables::params::package_name,