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

Allow for config entry to be a list in a dict for beacons (#33476)

Browse source 
Fixes #29451
This commit is contained in:
Mike Place 2016-05-24 09:38:42 -07:00 • committed by Nicole Thomas
parent 9f56ab4c45
commit b4071b07f1
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/beacons/__init__.py
View file

@ -102,7 +102,13 @@ class Beacon(object):
if val_config:
config = val_config[0][val]
elif isinstance(config_mod, dict):
config = config_mod[mod].get(val, False)
try:
config = config_mod[mod].get(val, False)
except AttributeError: # The config is a list
config = None
val_config = [arg for arg in config_mod if val in arg]
if val_config:
config = val_config[0][val]
return config
def _process_interval(self, mod, interval):