diff --git a/.fixtures.yml b/.fixtures.yml index 3482bac5..4815848b 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -17,8 +17,6 @@ fixtures: postgresql: repo: 'https://github.com/puppetlabs/puppetlabs-postgresql.git' ref: 'v9.2.0' - firewall: - repo: 'https://github.com/puppetlabs/puppetlabs-firewall.git' - ref: 'v6.0.0' + firewall: 'https://github.com/puppetlabs/puppetlabs-firewall.git' symlinks: puppetdb: '#{source_dir}' diff --git a/manifests/server/firewall.pp b/manifests/server/firewall.pp index 9ab95ca9..4330e053 100644 --- a/manifests/server/firewall.pp +++ b/manifests/server/firewall.pp @@ -11,17 +11,17 @@ if ($open_http_port) { firewall { "${http_port} accept - puppetdb": - dport => $http_port, - proto => 'tcp', - action => 'accept', + dport => $http_port, + proto => 'tcp', + jump => 'accept', } } if ($open_ssl_port) { firewall { "${ssl_port} accept - puppetdb": - dport => $ssl_port, - proto => 'tcp', - action => 'accept', + dport => $ssl_port, + proto => 'tcp', + jump => 'accept', } } } diff --git a/metadata.json b/metadata.json index 74f87905..5e11758c 100644 --- a/metadata.json +++ b/metadata.json @@ -18,7 +18,7 @@ }, { "name": "puppetlabs/firewall", - "version_requirement": ">= 1.1.3 < 7.0.0" + "version_requirement": ">= 7.0.0 < 8.0.0" }, { "name": "puppetlabs/stdlib", diff --git a/spec/support/unit/shared/server.rb b/spec/support/unit/shared/server.rb index 5c03dd37..d15b4986 100644 --- a/spec/support/unit/shared/server.rb +++ b/spec/support/unit/shared/server.rb @@ -21,7 +21,7 @@ .with( dport: with[:http_port], proto: 'tcp', - action: 'accept', + jump: 'accept', ) } @@ -31,7 +31,7 @@ .with( dport: with[:ssl_port], proto: 'tcp', - action: 'accept', + jump: 'accept', ) } end