cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #970 from mattupstate/devel

Browse source 
Improve apt_repository and supervisorctl
This commit is contained in:
Michael DeHaan 2012-08-30 16:21:47 -07:00
commit c02e4a0b5a
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apt_repository
View file

@ -39,6 +39,8 @@ def _find_binary(module):
'%s' % binaries) '%s' % binaries)
def _run(cmd): def _run(cmd):
if platform.dist()[0] == 'debian' or float(platform.dist()[1]) >= 11.10:
cmd = cmd + ' -y'
# returns (rc, stdout, stderr) from shell command # returns (rc, stdout, stderr) from shell command
process = subprocess.Popen(cmd, stdout=subprocess.PIPE, process = subprocess.Popen(cmd, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, shell=True) stderr=subprocess.PIPE, shell=True)
@ -72,9 +74,6 @@ def main():
cmd = '%s "%s"' % (add_apt_repository, repo) cmd = '%s "%s"' % (add_apt_repository, repo)
if platform.dist()[0] == 'debian' or float(platform.dist()[1]) >= 11.10:
cmd = cmd + ' -y'
rc, out, err = _run(cmd) rc, out, err = _run(cmd)
changed = rc == 0 and not existed changed = rc == 0 and not existed

22
supervisorctl
View file

@ -27,6 +27,9 @@ def _find_supervisorctl():
if os.path.exists(e): if os.path.exists(e):
return e return e
def _is_present(name):
rc, out, err = _run('%s status' % _find_supervisorctl())
return name in out
def _is_running(name): def _is_running(name):
rc, out, err = _run('%s status %s' % (_find_supervisorctl(), name)) rc, out, err = _run('%s status %s' % (_find_supervisorctl(), name))
@ -44,7 +47,7 @@ def _run(cmd):
def main(): def main():
arg_spec = dict( arg_spec = dict(
name=dict(required=True), name=dict(required=True),
state=dict(required=True, choices=['started', 'restarted', 'stopped']) state=dict(required=True, choices=['present', 'started', 'restarted', 'stopped'])
) )
module = AnsibleModule(argument_spec=arg_spec) module = AnsibleModule(argument_spec=arg_spec)
@ -57,6 +60,20 @@ def main():
if SUPERVISORCTL is None: if SUPERVISORCTL is None:
module.fail_json(msg='supervisorctl is not installed') module.fail_json(msg='supervisorctl is not installed')
present = _is_present(name)
if state == 'present':
if not present:
_run('%s reread' % SUPERVISORCTL)
rc, out, err = _run('%s add %s' % (SUPERVISORCTL, name))
if '%s: added process group' % name in out:
module.exit_json(changed=True, name=name, state=state)
else:
module.fail_json(msg=out, name=name, state=state)
module.exit_json(changed=False, name=name, state=state)
running = _is_running(name) running = _is_running(name)
if running and state == 'started': if running and state == 'started':
@ -71,7 +88,7 @@ def main():
module.fail_json(msg=out) module.fail_json(msg=out)
elif running and state == 'restarted': elif running and state == 'restarted':
rc, out, err = _run('%s update' % SUPERVISORCTL) rc, out, err = _run('%s update %s' % (SUPERVISORCTL, name))
rc, out, err = _run('%s restart %s' % (SUPERVISORCTL, name)) rc, out, err = _run('%s restart %s' % (SUPERVISORCTL, name))
if '%s: stopped' % name in out and '%s: started' % name in out: if '%s: stopped' % name in out and '%s: started' % name in out:
@ -80,7 +97,6 @@ def main():
module.fail_json(msg=out) module.fail_json(msg=out)
elif not running and state == 'started': elif not running and state == 'started':
rc, out, err = _run('%s update' % SUPERVISORCTL)
rc, out, err = _run('%s start %s' % (SUPERVISORCTL, name)) rc, out, err = _run('%s start %s' % (SUPERVISORCTL, name))
if '%s: started' % name in out: if '%s: started' % name in out: