puppetlabs/firewall: Allow 7.x

Author: evgeni

.fixtures.yml

@@ -2,9 +2,7 @@ fixtures:
   repositories:
     apache: https://github.com/puppetlabs/puppetlabs-apache.git
     apt: https://github.com/puppetlabs/puppetlabs-apt.git
-    firewall:
-      repo: https://github.com/puppetlabs/puppetlabs-firewall
-      ref: v6.0.0
+    firewall: https://github.com/puppetlabs/puppetlabs-firewall
     stdlib: https://github.com/puppetlabs/puppetlabs-stdlib.git
     concat: https://github.com/puppetlabs/puppetlabs-concat.git
     postgresql: https://github.com/puppetlabs/puppet-postgresql.git

manifests/agent.pp

@@ -385,7 +385,7 @@
       firewall { "150 zabbix-agent from ${_server}":
         dport  => $listenport,
         proto  => 'tcp',
-        action => 'accept',
+        jump   => 'accept',
         source => $_server,
         state  => [
           'NEW',

manifests/javagateway.pp

@@ -66,10 +66,10 @@
   # Manage firewall
   if $manage_firewall {
     firewall { '152 zabbix-javagateway':
-      dport  => $listenport,
-      proto  => 'tcp',
-      action => 'accept',
-      state  => ['NEW','RELATED', 'ESTABLISHED'],
+      dport => $listenport,
+      proto => 'tcp',
+      jump  => 'accept',
+      state => ['NEW','RELATED', 'ESTABLISHED'],
     }
   }
 }

manifests/proxy.pp

@@ -492,10 +492,10 @@
   # Manage firewall
   if $manage_firewall {
     firewall { '151 zabbix-proxy':
-      dport  => $listenport,
-      proto  => 'tcp',
-      action => 'accept',
-      state  => [
+      dport => $listenport,
+      proto => 'tcp',
+      jump  => 'accept',
+      state => [
         'NEW',
         'RELATED',
         'ESTABLISHED',

manifests/server.pp

@@ -454,10 +454,10 @@
   # Manage firewall
   if $manage_firewall {
     firewall { '151 zabbix-server':
-      dport  => $listenport,
-      proto  => 'tcp',
-      action => 'accept',
-      state  => [
+      dport => $listenport,
+      proto => 'tcp',
+      jump  => 'accept',
+      state => [
         'NEW',
         'RELATED',
         'ESTABLISHED',

metadata.json

@@ -22,7 +22,7 @@
     },
     {
       "name": "puppetlabs/firewall",
-      "version_requirement": ">= 1.7.0 < 7.0.0"
+      "version_requirement": ">= 7.0.0 < 8.0.0"
     },
     {
       "name": "puppetlabs/apt",