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

Override minion opts with pillar data

Browse source
This commit is contained in:
Mircea Ulinic 2017-06-01 12:55:01 +00:00
parent 367668a0a3
commit abab6fd91c
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/minion.py
View file

@ -3118,6 +3118,9 @@ class ProxyMinion(Minion):
if 'proxy' not in self.opts:
self.opts['proxy'] = self.opts['pillar']['proxy']
# update opts, to override data with pillar data
self.opts.update(self.opts['pillar'])
fq_proxyname = self.opts['proxy']['proxytype']
# Need to load the modules so they get all the dunder variables