]> review.fuel-infra Code Review - puppet-modules/puppetlabs-firewall.git/commitdiff
Makes all the services autorequired by the firewall and firewall chain types.
authorJonathan Tripathy <jt@puppetlabs.com>
Thu, 2 Jul 2015 15:41:03 +0000 (16:41 +0100)
committerJonathan Tripathy <jt@puppetlabs.com>
Thu, 2 Jul 2015 15:41:03 +0000 (16:41 +0100)
lib/puppet/type/firewall.rb
lib/puppet/type/firewallchain.rb

index 56c6c0c779413c9441fc694148974884f8dffcc9..35c699b03e46e449032a4916b2a21cc399d4bb64 100644 (file)
@@ -1339,7 +1339,16 @@ Puppet::Type.newtype(:firewall) do
   autorequire(:package) do
     case value(:provider)
     when :iptables, :ip6tables
-      %w{iptables iptables-persistent netfilter-persistent iptables-services}
+      %w{iptables iptables-persistent iptables-services}
+    else
+      []
+    end
+  end
+
+  autorequire(:service) do
+    case value(:provider)
+    when :iptables, :ip6tables
+      %w{firewalld iptables ip6tables iptables-persistent netfilter-persistent}
     else
       []
     end
index b962a0a36b283d1dedfcca701099dec0c20cdeb8..cb2c61412b3c8e31feff97ea6c0114005604db23 100644 (file)
@@ -157,6 +157,15 @@ Puppet::Type.newtype(:firewallchain) do
     end
   end
 
+  autorequire(:service) do
+    case value(:provider)
+    when :iptables, :ip6tables
+      %w{firewalld iptables ip6tables iptables-persistent netfilter-persistent}
+    else
+      []
+    end
+  end
+
   validate do
     debug("[validate]")