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

Cleanup for #13160

Browse Source 
This commit makes the changes from #13160 conform to the Salt way by
kreturning booleans for enable/disable. In addition, it makes the
following changes:

1. Adds versionadded directives

2. Fixes leaked file handles by using with statements (and
   salt.utils.fopen).

3. Raises a CommandExecutionError in ares where the failure of a
   function reaches an error case.
This commit is contained in:
Erik Johnson 2014-06-01 13:02:13 -05:00
parent bcca77c312
commit 47cfbd40f4
1 changed files with 54 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
salt/modules/puppet.py
View File

@ -4,12 +4,16 @@ Execute puppet routines
'''
# Import python libs
import logging
import os
import yaml
import datetime
# Import salt libs
import salt.utils
from salt.exceptions import CommandExecutionError
log = logging.getLogger(__name__)
def __virtual__():
@ -186,6 +190,8 @@ def noop(*args, **kwargs):
def enable():
'''
.. versionadded:: Helium
Enable the puppet agent
CLI Example:
@ -201,15 +207,19 @@ def enable():
if os.path.isfile(puppet.disabled_lockfile):
try:
os.remove(puppet.disabled_lockfile)
return 'successfully enabled'
except (IOError, OSError):
return 'failed to enable'
else:
return 'already enabled'
msg = 'Failed to enable: {0}'.format(exc)
log.error(msg)
raise CommandExecutionError(msg)
else:
return True
return False
def disable():
'''
.. versionadded:: Helium
Disable the puppet agent
CLI Example:
@ -223,19 +233,24 @@ def disable():
puppet = _Puppet()
if os.path.isfile(puppet.disabled_lockfile):
return 'already disabled'
return False
else:
try:
lockfile = open(puppet.disabled_lockfile, 'w')
lockfile.write('{}') # puppet chokes when no valid json is found
lockfile.close()
return 'successfully disabled'
except (IOError, OSError):
return 'failed to disable'
with salt.utils.fopen(puppet.disabled_lockfile, 'w') as lockfile:
try:
# Puppet chokes when no valid json is found
lockfile.write('{}')
lockfile.close()
return True
except (IOError, OSError) as exc:
msg = 'Failed to disable: {0}'.format(exc)
log.error(msg)
raise CommandExecutionError(msg)
def status():
'''
.. versionadded:: Helium
Display puppet agent status
CLI Example:
@ -244,34 +259,39 @@ def status():
salt '*' puppet.status
'''
_check_puppet()
puppet = _Puppet()
if os.path.isfile(puppet.disabled_lockfile):
return 'administratively disabled'
return 'Administratively disabled'
if os.path.isfile(puppet.run_lockfile):
try:
pid = int(open(puppet.run_lockfile, 'r').read())
os.kill(pid, 0)
return 'applying a catalog'
with salt.utils.fopen(puppet.run_lockfile, 'r') as fp_:
pid = int(fp_.read())
except (OSError, ValueError):
return 'stale lockfile'
return 'Stale lockfile'
else:
os.kill(pid, 0)
return 'Applying a catalog'
if os.path.isfile(puppet.agent_pidfile):
try:
pid = int(open(puppet.agent_pidfile, 'r').read())
os.kill(pid, 0)
return 'idle daemon'
with salt.utils.fopen(puppet.agent_pidfile, 'r') as fp_:
pid = int(fp_.read())
except (OSError, ValueError):
return 'stale pidfile'
return 'Stale pidfile'
else:
os.kill(pid, 0)
return 'Idle daemon'
return 'stopped'
return 'Stopped'
def summary():
'''
.. versionadded:: Helium
Show a summary of the last puppet agent run
CLI Example:
@ -285,7 +305,8 @@ def summary():
puppet = _Puppet()
try:
report = yaml.load(open(puppet.lastrunfile, 'r'))
with salt.utils.fopen(puppet.lastrunfile, 'r') as fp_:
report = yaml.safe_load(fp_.read())
result = {}
if 'time' in report:
@ -303,12 +324,16 @@ def summary():
if 'resources' in report:
result['resources'] = report['resources']
return result
except yaml.YAMLError as exc:
raise CommandExecutionError(
'YAML error parsing puppet run summary: {0}'.format(exc)
)
except IOError as exc:
raise CommandExecutionError(
'Unable to read puppet run summary: {0}'.format(exc)
)
except yaml.YAMLError:
return 'failed to parse puppet run summary'
except IOError:
return 'unable to read puppet run summary'
return result
def facts(puppet=False):