mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
pillarenv argument should default to None and not the value from opts
This commit is contained in:
parent
2a185855ea
commit
467ff841cd
1 changed files with 1 additions and 1 deletions
|
@ -82,8 +82,8 @@ def show_pillar(minion='*', **kwargs):
|
|||
pillar = runner.cmd('pillar.show_pillar', [])
|
||||
print(pillar)
|
||||
'''
|
||||
pillarenv = None
|
||||
saltenv = 'base'
|
||||
pillarenv = __opts__.get('pillarenv')
|
||||
id_, grains, _ = salt.utils.minions.get_minion_data(minion, __opts__)
|
||||
if grains is None:
|
||||
grains = {'fqdn': minion}
|
||||
|
|
Loading…
Add table
Reference in a new issue