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

lint fixes

Browse Source
This commit is contained in:
Morgan Willcock 2017-02-13 11:00:01 +00:00
parent c4a85c73aa
commit ea6b7ed5af
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
salt/states/win_system.py
View File

@ -235,12 +235,13 @@ def join_domain(name, username=None, password=None, account_ou=None,
ret['result'] = False ret['result'] = False
return ret return ret
def reboot(name, message=None, timeout=5, force_close=True, in_seconds=False, def reboot(name, message=None, timeout=5, force_close=True, in_seconds=False,
only_on_pending_reboot=True): only_on_pending_reboot=True):
''' '''
Reboot the computer Reboot the computer
:param str message: :param str message:
An optional message to display to users. It will also be used as a An optional message to display to users. It will also be used as a
comment in the event log entry. comment in the event log entry.
@ -280,6 +281,7 @@ def reboot(name, message=None, timeout=5, force_close=True, in_seconds=False,
in_seconds=in_seconds, in_seconds=in_seconds,
only_on_pending_reboot=only_on_pending_reboot) only_on_pending_reboot=only_on_pending_reboot)
def shutdown(name, message=None, timeout=5, force_close=True, reboot=False, def shutdown(name, message=None, timeout=5, force_close=True, reboot=False,
in_seconds=False, only_on_pending_reboot=False): in_seconds=False, only_on_pending_reboot=False):
''' '''
@ -341,10 +343,10 @@ def shutdown(name, message=None, timeout=5, force_close=True, reboot=False,
if only_on_pending_reboot and not __salt__['system.get_pending_reboot'](): if only_on_pending_reboot and not __salt__['system.get_pending_reboot']():
if __opts__['test']: if __opts__['test']:
ret['comment'] = ('System {0} will be skipped because ' ret['comment'] = ('System {0} will be skipped because '
'no reboot is pending').format(action) 'no reboot is pending').format(action)
else: else:
ret['comment'] = ('System {0} has been skipped because ' ret['comment'] = ('System {0} has been skipped because '
'no reboot was pending').format(action) 'no reboot was pending').format(action)
return ret return ret
if __opts__['test']: if __opts__['test']:
@ -360,9 +362,9 @@ def shutdown(name, message=None, timeout=5, force_close=True, reboot=False,
only_on_pending_reboot=False) only_on_pending_reboot=False)
if ret['result']: if ret['result']:
ret['changes'] = {'old': 'No reboot or shutdown was scheduled', ret['changes'] = {'old': 'No reboot or shutdown was scheduled',
'new': 'A {0} has been scheduled'.format(action)} 'new': 'A {0} has been scheduled'.format(action)}
ret['comment'] = 'Request to {0} was successful'.format(action) ret['comment'] = 'Request to {0} was successful'.format(action)
else: else:
ret['comment'] = 'Request to {0} failed'.format(action) ret['comment'] = 'Request to {0} failed'.format(action)
return ret return ret