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

Merge pull request #223 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:
Imran Iqbal 2021-01-14 21:26:42 +00:00 committed by GitHub
commit 7f297a593c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 3640 additions and 3653 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
php/_mapdata/init.sls
View File

@ -6,9 +6,7 @@
{%- from tplroot ~ "/map.jinja" import php with context %} {%- from tplroot ~ "/map.jinja" import php with context %}
{%- set _mapdata = { {%- set _mapdata = {
"values": { "values": php,
"php": php,
}
} %} } %}
{%- 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:
php:
apache2: apache2:
ini: ini:
opts: {} opts: {}

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

@ -2,7 +2,6 @@
# Amazon Linux-2 # Amazon Linux-2
--- ---
values: values:
php:
apache2: apache2:
ini: ini:
opts: {} opts: {}

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

@ -2,7 +2,6 @@
# CentOS Linux-7 # CentOS Linux-7
--- ---
values: values:
php:
apache2: apache2:
ini: ini:
opts: {} opts: {}

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

@ -2,7 +2,6 @@
# CentOS Linux-8 # CentOS Linux-8
--- ---
values: values:
php:
apache2: apache2:
ini: ini:
opts: {} opts: {}

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

@ -2,7 +2,6 @@
# Debian-10 # Debian-10
--- ---
values: values:
php:
apache2: apache2:
ini: ini:
opts: {} opts: {}

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

@ -2,7 +2,6 @@
# Debian-9 # Debian-9
--- ---
values: values:
php:
apache2: apache2:
ini: ini:
opts: {} opts: {}

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

@ -2,7 +2,6 @@
# Fedora-30 # Fedora-30
--- ---
values: values:
php:
apache2: apache2:
ini: ini:
opts: {} opts: {}

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

@ -2,7 +2,6 @@
# Fedora-31 # Fedora-31
--- ---
values: values:
php:
apache2: apache2:
ini: ini:
opts: {} opts: {}

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

@ -2,7 +2,6 @@
# Leap-15 # Leap-15
--- ---
values: values:
php:
apache2: apache2:
ini: ini:
opts: {} opts: {}

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

@ -2,7 +2,6 @@
# Ubuntu-16.04 # Ubuntu-16.04
--- ---
values: values:
php:
apache2: apache2:
ini: ini:
opts: {} opts: {}

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

@ -2,7 +2,6 @@
# Ubuntu-18.04 # Ubuntu-18.04
--- ---
values: values:
php:
apache2: apache2:
ini: ini:
opts: {} opts: {}