From 94cdd54caa0cfabb80dab35ebfe9ae02d68ddfb3 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 3 Sep 2013 15:47:18 -0400 Subject: Work around for shorewall not being available at the site_config stage (#3339) Change-Id: Id3138cb967f76380b7f4e22ce862a099cb47669e --- puppet/modules/site_config/manifests/initial_firewall.pp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'puppet/modules') diff --git a/puppet/modules/site_config/manifests/initial_firewall.pp b/puppet/modules/site_config/manifests/initial_firewall.pp index 9178a5f2..6bef0032 100644 --- a/puppet/modules/site_config/manifests/initial_firewall.pp +++ b/puppet/modules/site_config/manifests/initial_firewall.pp @@ -50,15 +50,13 @@ class site_config::initial_firewall { 'default_ipv4_firewall': command => '/sbin/iptables-restore < /etc/network/ipv4firewall_up.rules', logoutput => true, - unless => '/sbin/shorewall status', - require => [ Package['shorewall'], - File['/etc/network/ipv4firewall_up.rules'] ]; + unless => '/etc/init.d/shorewall status', + require => File['/etc/network/ipv4firewall_up.rules']; 'default_ipv6_firewall': command => '/sbin/ip6tables-restore < /etc/network/ipv6firewall_up.rules', logoutput => true, - unless => '/sbin/shorewall status', - require => [ Package['shorewall'], - File['/etc/network/ipv6firewall_up.rules'] ]; + unless => '/etc/init.d/shorewall status', + require => File['/etc/network/ipv6firewall_up.rules']; } } -- cgit v1.2.3