valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

process_beacons: read beacon configuration from per minion opts

Browse Source 
The beacon manipulation functions, such as enable_beacons and
disable_beacons, use self.opts to enable/disable beacons. However,
process_beacons use __opts__ to retrieve the becon's configuration,
which is no longer the same, due to comit 5821b39. Make process_beacon
read beacon configuration from self.opts instead.

Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
This commit is contained in:
Alejandro del Castillo 2016-07-07 21:56:36 +00:00
parent 4c75d4f92b
commit fce64d8ccf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/minion.py
View File

@ -395,7 +395,7 @@ class MinionBase(object):
the pillar or grains changed the pillar or grains changed
''' '''
if 'config.merge' in functions: if 'config.merge' in functions:
b_conf = functions['config.merge']('beacons') b_conf = functions['config.merge']('beacons', self.opts['beacons'], omit_opts=True)
if b_conf: if b_conf:
return self.beacons.process(b_conf) # pylint: disable=no-member return self.beacons.process(b_conf) # pylint: disable=no-member
return [] return []