saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

updates to /docs/man/salt.7 and /changelog

Browse source
This commit is contained in:
Jasper Koolhaas 2022-09-06 11:19:23 +02:00 • committed by Megan Wilhite
parent 34f33930de
commit 0102a145c7
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog/62578.added Normal file
View file

@ -0,0 +1,2 @@
Adds __env__substitution to ext_pillar.stack; followup of #61531, improved exception handling for stacked template (jinja) template rendering and yaml parsing in ext_pillar.stack

11
doc/man/salt.7
View file

@ -353551,15 +353551,16 @@ Here is an example of such a configuration, which should speak by itself:
.ft C
ext_pillar:
\- makostack:
pillar:environment:
dev: /path/to/dev/stack.cfg
prod: /path/to/prod/stack.cfg
pillar:something:
bar: /path/to/dev/stack.cfg
foo: /path/to/prod/stack.cfg
grains:custom:grain:
value:
\- /path/to/stack1.cfg
\- /path/to/stack2.cfg
opts:custom:opt:
value: /path/to/stack0.cfg
opts:saltenv:
dev: /path/to/dev/stack.cfg
__env__: /path/to/__env__/stack.cfg
.ft P
.fi
.UNINDENT