From: Jonathan Tripathy <jt@puppetlabs.com>
Date: Wed, 6 May 2015 15:49:08 +0000 (+0100)
Subject: Added iptables-persistent fix for Debian 8 and Ubuntu 14.10
X-Git-Tag: 1.6.0~12^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2b4bc337beb87a23e1112060f1e43a45f48cc2ec;p=puppet-modules%2Fpuppetlabs-firewall.git

Added iptables-persistent fix for Debian 8 and Ubuntu 14.10
---

diff --git a/manifests/params.pp b/manifests/params.pp
index c8e2ade..9d0f64d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -33,7 +33,7 @@ class firewall::params {
         'Debian': {
           if versioncmp($::operatingsystemrelease, '8.0') >= 0 {
             $service_name = 'netfilter-persistent'
-            $package_name = 'netfilter-persistent'
+            $package_name = 'iptables-persistent'
           } else {
             $service_name = 'iptables-persistent'
             $package_name = 'iptables-persistent'
@@ -43,7 +43,7 @@ class firewall::params {
         'Ubuntu': {
           if versioncmp($::operatingsystemrelease, '14.10') >= 0 {
             $service_name = 'netfilter-persistent'
-            $package_name = 'netfilter-persistent'
+            $package_name = 'iptables-persistent'
           } else {
             $service_name = 'iptables-persistent'
             $package_name = 'iptables-persistent'
diff --git a/metadata.json b/metadata.json
index cd452af..65099d0 100644
--- a/metadata.json
+++ b/metadata.json
@@ -50,7 +50,8 @@
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "6",
-        "7"
+        "7",
+        "8"
       ]
     },
     {
diff --git a/spec/unit/classes/firewall_linux_debian_spec.rb b/spec/unit/classes/firewall_linux_debian_spec.rb
index f781743..e8af543 100644
--- a/spec/unit/classes/firewall_linux_debian_spec.rb
+++ b/spec/unit/classes/firewall_linux_debian_spec.rb
@@ -35,13 +35,13 @@ describe 'firewall::linux::debian', :type => :class do
         :operatingsystem       => 'Debian',
         :operatingsystemrelease => 'jessie/sid'
     }}
-    it { should contain_package('netfilter-persistent').with(
+    it { should contain_package('iptables-persistent').with(
       :ensure => 'present'
     )}
     it { should contain_service('netfilter-persistent').with(
       :ensure   => nil,
       :enable   => 'true',
-      :require  => 'Package[netfilter-persistent]'
+      :require  => 'Package[iptables-persistent]'
     )}
   end
 
@@ -63,13 +63,13 @@ describe 'firewall::linux::debian', :type => :class do
         :operatingsystem        => 'Debian',
         :operatingsystemrelease => '8.0'
     }}
-    it { should contain_package('netfilter-persistent').with(
+    it { should contain_package('iptables-persistent').with(
       :ensure => 'present'
     )}
     it { should contain_service('netfilter-persistent').with(
       :ensure   => nil,
       :enable   => 'true',
-      :require  => 'Package[netfilter-persistent]'
+      :require  => 'Package[iptables-persistent]'
     )}
   end