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

fix(_mapdata): ensure map data is directly under `values`
2021-01-14 21:26:42 +00:00 · 2021-01-14 21:26:42 +00:00 · 7f297a593c
commit 7f297a593c
parent e62a915b55 b30f5146d0
12 changed files with 3640 additions and 3653 deletions
--- a/php/_mapdata/init.sls
+++ b/php/_mapdata/init.sls
@ -6,9 +6,7 @@
 {%- from tplroot ~ "/map.jinja" import php with context %}

 {%- set _mapdata = {
-      "values": {
-        "php": php,
-      }
+      "values": php,
    } %}
 {%- 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:
-  php:
  apache2:
    ini:
      opts: {}
--- 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:
-  php:
  apache2:
    ini:
      opts: {}
--- 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:
-  php:
  apache2:
    ini:
      opts: {}
--- 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:
-  php:
  apache2:
    ini:
      opts: {}
--- 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:
-  php:
  apache2:
    ini:
      opts: {}
--- 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:
-  php:
  apache2:
    ini:
      opts: {}
--- a/test/integration/default/files/_mapdata/fedora-30.yaml
+++ b/test/integration/default/files/_mapdata/fedora-30.yaml
@ -2,7 +2,6 @@
 # Fedora-30
 ---
 values:
-  php:
  apache2:
    ini:
      opts: {}
--- 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:
-  php:
  apache2:
    ini:
      opts: {}
--- 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:
-  php:
  apache2:
    ini:
      opts: {}
--- 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:
-  php:
  apache2:
    ini:
      opts: {}
--- 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:
-  php:
  apache2:
    ini:
      opts: {}