Skip to content
Snippets Groups Projects
Unverified Commit 5b7d7ea7 authored by Robert Fairburn's avatar Robert Fairburn Committed by Imran Iqbal
Browse files

fix(master): master.d template to support saltclass ext_pillar

parent ddd5a0cc
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 42 additions and 0 deletions
salt/files/master.d/f_defaults.conf
+ 4
− 0
View file @ 5b7d7ea7
......@@ -1207,12 +1207,16 @@ ext_pillar:
{%- for parameter in pillar[key] %}
{%- if parameter is iterable and parameter is not string %}
{%- for param, children in parameter.items() %}
{%- if children is string %}
- {{ param }}: {{ children }}
{%- else %}
- {{ param }}:
{%- for child in children %}
{%- for key, value in child.items() %}
- {{ key }}: {{ value }}
{%- endfor -%}
{%- endfor -%}
{%- endif -%}
{%- endfor -%}
{%- else %}
- {{ parameter }}
......
test/integration/default/files/_mapdata/almalinux-8.yaml
+ 2
− 0
View file @ 5b7d7ea7
......@@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
......
test/integration/default/files/_mapdata/amazonlinux-2.yaml
+ 2
− 0
View file @ 5b7d7ea7
......@@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
......
test/integration/default/files/_mapdata/arch-base-latest.yaml
+ 2
− 0
View file @ 5b7d7ea7
......@@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
......
test/integration/default/files/_mapdata/centos-7.yaml
+ 2
− 0
View file @ 5b7d7ea7
......@@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
......
test/integration/default/files/_mapdata/centos-8.yaml
+ 2
− 0
View file @ 5b7d7ea7
......@@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
......
test/integration/default/files/_mapdata/debian-10.yaml
+ 2
− 0
View file @ 5b7d7ea7
......@@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
......
test/integration/default/files/_mapdata/debian-11.yaml
+ 2
− 0
View file @ 5b7d7ea7
......@@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
......
test/integration/default/files/_mapdata/debian-9.yaml
+ 2
− 0
View file @ 5b7d7ea7
......@@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
......
test/integration/default/files/_mapdata/fedora-33.yaml
+ 2
− 0
View file @ 5b7d7ea7
......@@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
......
test/integration/default/files/_mapdata/fedora-34.yaml
+ 2
− 0
View file @ 5b7d7ea7
......@@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
......
test/integration/default/files/_mapdata/freebsd-12.yaml
+ 2
− 0
View file @ 5b7d7ea7
......@@ -50,6 +50,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
......
test/integration/default/files/_mapdata/freebsd-13.yaml
+ 2
− 0
View file @ 5b7d7ea7
......@@ -50,6 +50,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
......
test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
+ 2
− 0
View file @ 5b7d7ea7
......@@ -50,6 +50,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
......
test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
+ 2
− 0
View file @ 5b7d7ea7
......@@ -50,6 +50,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
......
test/integration/default/files/_mapdata/openbsd-6.yaml
+ 2
− 0
View file @ 5b7d7ea7
......@@ -50,6 +50,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
......
test/integration/default/files/_mapdata/openbsd-7.yaml
+ 2
− 0
View file @ 5b7d7ea7
......@@ -50,6 +50,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
......
test/integration/default/files/_mapdata/opensuse-15.yaml
+ 2
− 0
View file @ 5b7d7ea7
......@@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
......
test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
+ 2
− 0
View file @ 5b7d7ea7
......@@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
......
test/integration/default/files/_mapdata/oraclelinux-7.yaml
+ 2
− 0
View file @ 5b7d7ea7
......@@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment