Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: master.d template to support saltclass ext_pillar config #519

Merged
merged 1 commit into from
Nov 30, 2021
+60 −0
Merged

Fix: master.d template to support saltclass ext_pillar config #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions salt/files/master.d/f_defaults.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/almalinux-8.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/amazonlinux-2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/arch-base-latest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/centos-7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/centos-8.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/debian-10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/debian-11.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/debian-9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/fedora-33.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/fedora-34.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/freebsd-12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/freebsd-13.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/openbsd-6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/openbsd-7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/opensuse-15.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/oraclelinux-7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/oraclelinux-8.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/rockylinux-8.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/ubuntu-18.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/ubuntu-20.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
file_roots:
base:
- /srv/salt
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/windows-10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: "/srv/saltclass"
file_roots:
base:
- "/srv/salt"
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/windows-2016-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: "/srv/saltclass"
file_roots:
base:
- "/srv/salt"
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/windows-2019-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: "/srv/saltclass"
file_roots:
base:
- "/srv/salt"
Expand Down
2 changes: 2 additions & 0 deletions test/integration/default/files/_mapdata/windows-8.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ values:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: "/srv/saltclass"
file_roots:
base:
- "/srv/salt"
Expand Down
2 changes: 2 additions & 0 deletions test/salt/pillar/salt.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ salt:
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
- saltclass:
- path: /srv/saltclass
minion:
master: localhost
fileserver_backend:
Expand Down