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

Fixed issue #35198 now without deprecated code.

Browse source
This commit is contained in:
Justin Zandbergen 2016-08-05 19:10:43 +02:00 • committed by rallytime
parent 1241d87f1d
commit 8bba13896a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/beacons/service.py
View file

@ -86,13 +86,13 @@ def beacon(config):
# If no options is given to the service, we fall back to the defaults
# assign a False value to oncleanshutdown and onchangeonly. Those
# key:values are then added to the service dictionary.
if not config[service].has_key('oncleanshutdown'):
if not 'oncleanshutdown' in config[service]:
config[service]['oncleanshutdown'] = False
if not config[service].has_key('emitatstartup'):
if not 'emitatstartup' in config[service]:
config[service]['emitatstartup'] = True
if not config[service].has_key('onchangeonly'):
if not 'onchangeonly' in config[service]:
config[service]['onchangeonly'] = False
# We only want to report the nature of the shutdown
# if the current running status is False
# as well as if the config for the beacon asks for it