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

myii · web-flow · commit 0be2013da47b · 2021-01-14T21:27:41.000Z
fix(_mapdata): ensure map data is directly under `values`
diff --git a/rabbitmq/_mapdata/init.sls b/rabbitmq/_mapdata/init.sls
@@ -6,9 +6,7 @@
 {%- from tplroot ~ "/package-map.jinja" import pkgs with context %}
 
 {%- set _mapdata = {
-      "values": {
-        "pkgs": pkgs,
-      }
+      "values": pkgs,
     } %}
 {%- do salt["log.debug"]("### MAP.JINJA DUMP ###\n" ~ _mapdata | yaml(False)) %}
 
diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml
@@ -2,5 +2,4 @@
 # CentOS Linux-7
 ---
 values:
-  pkgs:
-    rabbitmq-server: rabbitmq-server
+  rabbitmq-server: rabbitmq-server
diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml
@@ -2,5 +2,4 @@
 # CentOS Linux-8
 ---
 values:
-  pkgs:
-    rabbitmq-server: rabbitmq-server
+  rabbitmq-server: rabbitmq-server
diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml
@@ -2,5 +2,4 @@
 # Debian-10
 ---
 values:
-  pkgs:
-    rabbitmq-server: rabbitmq-server
+  rabbitmq-server: rabbitmq-server
diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml
@@ -2,5 +2,4 @@
 # Debian-9
 ---
 values:
-  pkgs:
-    rabbitmq-server: rabbitmq-server
+  rabbitmq-server: rabbitmq-server
diff --git a/test/integration/default/files/_mapdata/fedora-30.yaml b/test/integration/default/files/_mapdata/fedora-30.yaml
@@ -2,5 +2,4 @@
 # Fedora-30
 ---
 values:
-  pkgs:
-    rabbitmq-server: rabbitmq-server
+  rabbitmq-server: rabbitmq-server
diff --git a/test/integration/default/files/_mapdata/fedora-31.yaml b/test/integration/default/files/_mapdata/fedora-31.yaml
@@ -2,5 +2,4 @@
 # Fedora-31
 ---
 values:
-  pkgs:
-    rabbitmq-server: rabbitmq-server
+  rabbitmq-server: rabbitmq-server
diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml
@@ -2,5 +2,4 @@
 # Leap-15
 ---
 values:
-  pkgs:
-    rabbitmq-server: rabbitmq-server
+  rabbitmq-server: rabbitmq-server
diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml
@@ -2,5 +2,4 @@
 # Ubuntu-16.04
 ---
 values:
-  pkgs:
-    rabbitmq-server: rabbitmq-server
+  rabbitmq-server: rabbitmq-server
diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml
@@ -2,5 +2,4 @@
 # Ubuntu-18.04
 ---
 values:
-  pkgs:
-    rabbitmq-server: rabbitmq-server
+  rabbitmq-server: rabbitmq-server
