File tree 2 files changed +15
-7
lines changed
test/integration/default/controls 2 files changed +15
-7
lines changed Original file line number Diff line number Diff line change 6
6
{%- set install = firewall.install % }
7
7
{%- set strict_mode = firewall.strict % }
8
8
{%- set global_block_nomatch = firewall.block_nomatch % }
9
- {%- set packages = firewall.pkgs % }
9
+ {# - TODO : Ideally, this Fedora 34 fix should be provided from `osfingermap.yaml` but that isn't available #}
10
+ {# - Resolve this when the new `map.jinja` is made available for this formula #}
11
+ {%- set packages = [' iptables-compat' ] if grains.get(' osfinger' , ' ' ) == ' Fedora-34' else firewall.pkgs % }
10
12
{%- set ipv4 = ' IPv4' % }
11
13
{%- set ipv6 = ' IPv6' % }
12
14
{%- set protocols = [ipv4] % }
Original file line number Diff line number Diff line change 2
2
3
3
common_packages = [ 'iptables' ]
4
4
5
- case os [ :name ]
6
- when 'debian' , 'ubuntu'
7
- all_packages = common_packages + %w[ iptables-persistent netbase ]
8
- else
9
- all_packages = common_packages
10
- end
5
+ all_packages =
6
+ case platform [ :name ]
7
+ when 'debian' , 'ubuntu'
8
+ common_packages + %w[ iptables-persistent netbase ]
9
+ else
10
+ case system . platform [ :finger ]
11
+ when 'fedora-34'
12
+ [ 'iptables-compat' ]
13
+ else
14
+ common_packages
15
+ end
16
+ end
11
17
12
18
control 'Packages' do
13
19
all_packages . each do |p |
You can’t perform that action at this time.
0 commit comments