Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow puppetlabs/firewall 8.x #26

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

allow puppetlabs/firewall 8.x #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7011af5
allow puppetlabs/firewall 8.x
jhoblitt Sep 7, 2024
9a2fd20
modernize .fixtures.yml and remove version pins
jhoblitt Oct 11, 2024
241848f
rm empty data/common.yaml
jhoblitt Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 7 additions & 20 deletions .fixtures.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,10 @@
# This file can be used to install module dependencies for unit testing
# See https://github.com/puppetlabs/puppetlabs_spec_helper#using-fixtures for details

---
fixtures:
forge_modules:
stdlib:
repo: puppetlabs/stdlib
apt:
repo: puppetlabs/apt
yumrepo_core:
repo: puppetlabs/yumrepo_core
firewall:
repo: puppetlabs/firewall
ref: '6.0.0'
epel:
repo: puppet/epel
augeasproviders_apache:
repo: puppet/augeasproviders_apache
httpauth:
repo: jamtur01/httpauth
symlinks:
perfsonar: "#{source_dir}"
apt: puppetlabs/apt
augeasproviders_apache: puppet/augeasproviders_apache
epel: puppet/epel
firewall: puppetlabs/firewall
httpauth: jamtur01/httpauth
stdlib: puppetlabs/stdlib
yumrepo_core: puppetlabs/yumrepo_core
1 change: 0 additions & 1 deletion data/common.yaml
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions manifests/firewall.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
$_i = sprintf('%05d', $index)
$rule['proto'].each |String $proto| {
firewall { "${_i} ${rule['name']} ${proto} ipv4":
proto => $proto,
dport => $rule['dport'],
chain => 'perfSONAR',
action => 'accept',
proto => $proto,
dport => $rule['dport'],
chain => 'perfSONAR',
jump => 'accept',
}
}
}
Expand All @@ -56,7 +56,7 @@
firewall { '100 forward to perfSONAR ipv6':
chain => 'INPUT',
jump => 'perfSONAR',
provider => 'ip6tables',
protocol => 'IPv6',
}

firewallchain { 'perfSONAR:filter:IPv6':
Expand All @@ -71,8 +71,8 @@
proto => $proto,
dport => $rule['dport'],
chain => 'perfSONAR',
action => 'accept',
provider => 'ip6tables',
jump => 'accept',
protocol => 'IPv6',
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
{
"name": "puppetlabs/firewall",
"version_requirement": ">= 1.0.0 <7.0.0"
"version_requirement": ">= 7.0.0 <9.0.0"
},
{
"name": "puppet/epel",
Expand Down
Loading