Merge pull request puppetlabs#405 from cdenneen/master

EL7 Fixes for CentOS

Author: Morgan Haskel

lib/puppet/util/firewall.rb

@@ -169,7 +169,7 @@ def persist_iptables(proto)
     end
 
     # RHEL 7 and newer also use systemd to persist iptable rules
-    if os_key == 'RedHat' && Facter.value(:operatingsystem) == 'RedHat' && Facter.value(:operatingsystemrelease).to_i >= 7
+    if os_key == 'RedHat' && ['RedHat','CentOS','Scientific','SL','SLC','Ascendos','CloudLinux','PSBM','OracleLinux','OVS','OEL','Amazon','XenServer'].include?(Facter.value(:operatingsystem)) && Facter.value(:operatingsystemrelease).to_i >= 7
       os_key = 'Fedora'
     end
 

spec/unit/puppet/util/firewall_spec.rb

@@ -143,13 +143,22 @@
         subject.persist_iptables(proto)
       end
 
-      it 'should exec for CentOS identified from operatingsystem' do
+      it 'should exec for CentOS 6 identified from operatingsystem and operatingsystemrelease' do
         allow(Facter.fact(:osfamily)).to receive(:value).and_return(nil)
         allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('CentOS')
+        allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return('6.5')
         expect(subject).to receive(:execute).with(%w{/sbin/service iptables save})
         subject.persist_iptables(proto)
       end
 
+      it 'should exec for CentOS 7 identified from operatingsystem and operatingsystemrelease' do
+        allow(Facter.fact(:osfamily)).to receive(:value).and_return(nil)
+        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('CentOS')
+        allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return('7.0.1406')
+        expect(subject).to receive(:execute).with(%w{/usr/libexec/iptables/iptables.init save})
+        subject.persist_iptables(proto)
+      end
+
       it 'should exec for Archlinux identified from osfamily' do
         allow(Facter.fact(:osfamily)).to receive(:value).and_return('Archlinux')
         expect(subject).to receive(:execute).with(['/bin/sh', '-c', '/usr/sbin/iptables-save > /etc/iptables/iptables.rules'])