opendev
/
puppet-iptables
Code Issues Proposed changes

Ensure service logic run regardless of using chroot 

We want to stop notify from working in a chroot, however we need to
make sure we properly setup our Service correctly. As a result, move
the logic outside of our chroot checks.

Change-Id: I4c9284ed8ed23944aa3649338b1a09abdc8b80df
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-07-05 17:24:20 -04:00
parent ace48981af
commit 47ed5aabad
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/init.pp
View File

@ -30,14 +30,6 @@ class iptables(
$notify_iptables = []
}
else {
service { 'iptables':
name => $::iptables::params::service_name,
require => Package['iptables'],
hasstatus => $::iptables::params::service_has_status,
status => $::iptables::params::service_status_cmd,
hasrestart => $::iptables::params::service_has_restart,
enable => true,
}
$notify_iptables = Service['iptables']
# On centos 7 firewalld and iptables-service confuse each other and you
@ -56,6 +48,15 @@ class iptables(
}
}
service { 'iptables':
name => $::iptables::params::service_name,
require => Package['iptables'],
hasstatus => $::iptables::params::service_has_status,
status => $::iptables::params::service_status_cmd,
hasrestart => $::iptables::params::service_has_restart,
enable => true,
}
file { $::iptables::params::rules_dir:
ensure => directory,
require => Package['iptables'],