diff --git a/firewall/manifests/init.pp b/firewall/manifests/init.pp index 7e242a6..1cbbbcb 100644 --- a/firewall/manifests/init.pp +++ b/firewall/manifests/init.pp @@ -134,12 +134,23 @@ class firewall::common::iptables { } 'centos','redhat': { package { "iptables": - ensure => installed, - require => Package["iptables-ipv6"], - } - package { "iptables-ipv6": ensure => installed, } + if versioncmp($::operatingsystemrelease, 7) == 1 { + package { "firewalld": + ensure => absent, + before => Package["iptables"], + } + package { "iptables-services": + ensure => installed, + before => Package["iptables"], + } + } else { + package { "iptables-ipv6": + ensure => installed, + before => Package["iptables"], + } + } } 'fedora': { package { "iptables":