opendev
/
system-config
Code Issues Proposed changes

Merge "Don't manage iptables if we're in a choot"

This commit is contained in:
Jenkins 2014-07-05 23:08:55 +00:00 committed by Gerrit Code Review
parent 25f472b26d 98604d0215
commit 9cb87817fc
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
modules/iptables/manifests/init.pp
View File

@ -23,12 +23,21 @@ class iptables(
name => $::iptables::params::package_name,
}
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,
if ($::in_chroot) {
notify { 'iptables in chroot':
message => 'Iptables not refreshed, running in chroot',
}
$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,
}
$notify_iptables = Service['iptables']
}
file { $::iptables::params::rules_dir:
@ -49,7 +58,7 @@ class iptables(
File[$::iptables::params::rules_dir],
],
# When this file is updated, make sure the rules get reloaded.
notify => Service['iptables'],
notify => $notify_iptables,
}
file { $::iptables::params::ipv4_rules:
@ -59,7 +68,7 @@ class iptables(
mode => '0640',
target => "${::iptables::params::rules_dir}/rules",
require => File["${::iptables::params::rules_dir}/rules"],
notify => Service['iptables'],
notify => $notify_iptables,
}
file { $::iptables::params::ipv6_rules:
@ -73,7 +82,7 @@ class iptables(
File[$::iptables::params::rules_dir],
],
# When this file is updated, make sure the rules get reloaded.
notify => Service['iptables'],
notify => $notify_iptables,
replace => true,
}
}