saltstack-formulas/firewalld-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #48 from myii/fix/ensure-map-data-directly-under-values

Browse Source 
fix(_mapdata): ensure map data is directly under `values`
This commit is contained in:
Daniel 2021-01-14 21:07:15 +00:00 committed by GitHub
commit fbcb655e09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 2029 additions and 2044 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firewalld/_mapdata/init.sls
View File

@ -6,9 +6,7 @@
{%- from tplroot ~ "/map.jinja" import firewalld with context %} {%- from tplroot ~ "/map.jinja" import firewalld with context %}
{%- set _mapdata = { {%- set _mapdata = {
"values": { "values": firewalld,
"firewalld": firewalld,
}
} %} } %}
{%- do salt["log.debug"]("### MAP.JINJA DUMP ###\n" ~ _mapdata | yaml(False)) %} {%- do salt["log.debug"]("### MAP.JINJA DUMP ###\n" ~ _mapdata | yaml(False)) %}

1
test/integration/default/files/_mapdata/amazonlinux-1.yaml
View File

@ -2,7 +2,6 @@
# Amazon Linux AMI-2018 # Amazon Linux AMI-2018
--- ---
values: values:
firewalld:
AllowZoneDrifting: 'no' AllowZoneDrifting: 'no'
AutomaticHelpers: system AutomaticHelpers: system
FirewallBackend: nftables FirewallBackend: nftables

1
test/integration/default/files/_mapdata/amazonlinux-2.yaml
View File

@ -2,7 +2,6 @@
# Amazon Linux-2 # Amazon Linux-2
--- ---
values: values:
firewalld:
AllowZoneDrifting: 'no' AllowZoneDrifting: 'no'
AutomaticHelpers: system AutomaticHelpers: system
FirewallBackend: nftables FirewallBackend: nftables

1
test/integration/default/files/_mapdata/arch-base-latest.yaml
View File

@ -2,7 +2,6 @@
# Arch # Arch
--- ---
values: values:
firewalld:
AllowZoneDrifting: 'no' AllowZoneDrifting: 'no'
AutomaticHelpers: system AutomaticHelpers: system
FirewallBackend: nftables FirewallBackend: nftables

1
test/integration/default/files/_mapdata/centos-7.yaml
View File

@ -2,7 +2,6 @@
# CentOS Linux-7 # CentOS Linux-7
--- ---
values: values:
firewalld:
AllowZoneDrifting: 'no' AllowZoneDrifting: 'no'
AutomaticHelpers: system AutomaticHelpers: system
FirewallBackend: nftables FirewallBackend: nftables

1
test/integration/default/files/_mapdata/centos-8.yaml
View File

@ -2,7 +2,6 @@
# CentOS Linux-8 # CentOS Linux-8
--- ---
values: values:
firewalld:
AllowZoneDrifting: 'no' AllowZoneDrifting: 'no'
AutomaticHelpers: system AutomaticHelpers: system
FirewallBackend: nftables FirewallBackend: nftables

1
test/integration/default/files/_mapdata/debian-10.yaml
View File

@ -2,7 +2,6 @@
# Debian-10 # Debian-10
--- ---
values: values:
firewalld:
AllowZoneDrifting: 'no' AllowZoneDrifting: 'no'
AutomaticHelpers: system AutomaticHelpers: system
FirewallBackend: nftables FirewallBackend: nftables

1
test/integration/default/files/_mapdata/debian-9.yaml
View File

@ -2,7 +2,6 @@
# Debian-9 # Debian-9
--- ---
values: values:
firewalld:
AllowZoneDrifting: 'no' AllowZoneDrifting: 'no'
AutomaticHelpers: system AutomaticHelpers: system
FirewallBackend: nftables FirewallBackend: nftables

1
test/integration/default/files/_mapdata/fedora-31.yaml
View File

@ -2,7 +2,6 @@
# Fedora-31 # Fedora-31
--- ---
values: values:
firewalld:
AllowZoneDrifting: 'no' AllowZoneDrifting: 'no'
AutomaticHelpers: system AutomaticHelpers: system
FirewallBackend: nftables FirewallBackend: nftables

1
test/integration/default/files/_mapdata/fedora-32.yaml
View File

@ -2,7 +2,6 @@
# Fedora-32 # Fedora-32
--- ---
values: values:
firewalld:
AllowZoneDrifting: 'no' AllowZoneDrifting: 'no'
AutomaticHelpers: system AutomaticHelpers: system
FirewallBackend: nftables FirewallBackend: nftables

1
test/integration/default/files/_mapdata/opensuse-15.yaml
View File

@ -2,7 +2,6 @@
# Leap-15 # Leap-15
--- ---
values: values:
firewalld:
AllowZoneDrifting: 'no' AllowZoneDrifting: 'no'
AutomaticHelpers: system AutomaticHelpers: system
FirewallBackend: nftables FirewallBackend: nftables

1
test/integration/default/files/_mapdata/ubuntu-16.yaml
View File

@ -2,7 +2,6 @@
# Ubuntu-16.04 # Ubuntu-16.04
--- ---
values: values:
firewalld:
AllowZoneDrifting: 'no' AllowZoneDrifting: 'no'
AutomaticHelpers: system AutomaticHelpers: system
FirewallBackend: nftables FirewallBackend: nftables

1
test/integration/default/files/_mapdata/ubuntu-18.yaml
View File

@ -2,7 +2,6 @@
# Ubuntu-18.04 # Ubuntu-18.04
--- ---
values: values:
firewalld:
AllowZoneDrifting: 'no' AllowZoneDrifting: 'no'
AutomaticHelpers: system AutomaticHelpers: system
FirewallBackend: nftables FirewallBackend: nftables

1
test/integration/default/files/_mapdata/ubuntu-20.yaml
View File

@ -2,7 +2,6 @@
# Ubuntu-20.04 # Ubuntu-20.04
--- ---
values: values:
firewalld:
AllowZoneDrifting: 'no' AllowZoneDrifting: 'no'
AutomaticHelpers: system AutomaticHelpers: system
FirewallBackend: nftables FirewallBackend: nftables