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

fix(_mapdata): ensure map data is directly under `values`
2021-01-14 21:07:15 +00:00 · 2021-01-14 21:07:15 +00:00 · fbcb655e09
commit fbcb655e09
parent 87df82dc79 a647d6d9a3
14 changed files with 2029 additions and 2044 deletions
--- a/firewalld/_mapdata/init.sls
+++ b/firewalld/_mapdata/init.sls
@ -6,9 +6,7 @@
 {%- from tplroot ~ "/map.jinja" import firewalld with context %}

 {%- set _mapdata = {
-      "values": {
-        "firewalld": firewalld,
-      }
+      "values": firewalld,
    } %}
 {%- do salt["log.debug"]("### MAP.JINJA DUMP ###\n" ~ _mapdata | yaml(False)) %}

--- a/test/integration/default/files/_mapdata/amazonlinux-1.yaml
+++ b/test/integration/default/files/_mapdata/amazonlinux-1.yaml
@ -2,7 +2,6 @@
 # Amazon Linux AMI-2018
 ---
 values:
-  firewalld:
  AllowZoneDrifting: 'no'
  AutomaticHelpers: system
  FirewallBackend: nftables
--- a/test/integration/default/files/_mapdata/amazonlinux-2.yaml
+++ b/test/integration/default/files/_mapdata/amazonlinux-2.yaml
@ -2,7 +2,6 @@
 # Amazon Linux-2
 ---
 values:
-  firewalld:
  AllowZoneDrifting: 'no'
  AutomaticHelpers: system
  FirewallBackend: nftables
--- a/test/integration/default/files/_mapdata/arch-base-latest.yaml
+++ b/test/integration/default/files/_mapdata/arch-base-latest.yaml
@ -2,7 +2,6 @@
 # Arch
 ---
 values:
-  firewalld:
  AllowZoneDrifting: 'no'
  AutomaticHelpers: system
  FirewallBackend: nftables
--- a/test/integration/default/files/_mapdata/centos-7.yaml
+++ b/test/integration/default/files/_mapdata/centos-7.yaml
@ -2,7 +2,6 @@
 # CentOS Linux-7
 ---
 values:
-  firewalld:
  AllowZoneDrifting: 'no'
  AutomaticHelpers: system
  FirewallBackend: nftables
--- a/test/integration/default/files/_mapdata/centos-8.yaml
+++ b/test/integration/default/files/_mapdata/centos-8.yaml
@ -2,7 +2,6 @@
 # CentOS Linux-8
 ---
 values:
-  firewalld:
  AllowZoneDrifting: 'no'
  AutomaticHelpers: system
  FirewallBackend: nftables
--- a/test/integration/default/files/_mapdata/debian-10.yaml
+++ b/test/integration/default/files/_mapdata/debian-10.yaml
@ -2,7 +2,6 @@
 # Debian-10
 ---
 values:
-  firewalld:
  AllowZoneDrifting: 'no'
  AutomaticHelpers: system
  FirewallBackend: nftables
--- a/test/integration/default/files/_mapdata/debian-9.yaml
+++ b/test/integration/default/files/_mapdata/debian-9.yaml
@ -2,7 +2,6 @@
 # Debian-9
 ---
 values:
-  firewalld:
  AllowZoneDrifting: 'no'
  AutomaticHelpers: system
  FirewallBackend: nftables
--- a/test/integration/default/files/_mapdata/fedora-31.yaml
+++ b/test/integration/default/files/_mapdata/fedora-31.yaml
@ -2,7 +2,6 @@
 # Fedora-31
 ---
 values:
-  firewalld:
  AllowZoneDrifting: 'no'
  AutomaticHelpers: system
  FirewallBackend: nftables
--- a/test/integration/default/files/_mapdata/fedora-32.yaml
+++ b/test/integration/default/files/_mapdata/fedora-32.yaml
@ -2,7 +2,6 @@
 # Fedora-32
 ---
 values:
-  firewalld:
  AllowZoneDrifting: 'no'
  AutomaticHelpers: system
  FirewallBackend: nftables
--- a/test/integration/default/files/_mapdata/opensuse-15.yaml
+++ b/test/integration/default/files/_mapdata/opensuse-15.yaml
@ -2,7 +2,6 @@
 # Leap-15
 ---
 values:
-  firewalld:
  AllowZoneDrifting: 'no'
  AutomaticHelpers: system
  FirewallBackend: nftables
--- a/test/integration/default/files/_mapdata/ubuntu-16.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml
@ -2,7 +2,6 @@
 # Ubuntu-16.04
 ---
 values:
-  firewalld:
  AllowZoneDrifting: 'no'
  AutomaticHelpers: system
  FirewallBackend: nftables
--- a/test/integration/default/files/_mapdata/ubuntu-18.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml
@ -2,7 +2,6 @@
 # Ubuntu-18.04
 ---
 values:
-  firewalld:
  AllowZoneDrifting: 'no'
  AutomaticHelpers: system
  FirewallBackend: nftables
--- a/test/integration/default/files/_mapdata/ubuntu-20.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml
@ -2,7 +2,6 @@
 # Ubuntu-20.04
 ---
 values:
-  firewalld:
  AllowZoneDrifting: 'no'
  AutomaticHelpers: system
  FirewallBackend: nftables