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

Merge pull request #684 from nix85/fix_yum_mod

Browse source 
Standardizing the yum module
This commit is contained in:
Michael DeHaan 2012-07-25 17:33:55 -07:00
commit 1584eda3f8
1 changed files with 17 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
library/yum
View file

@ -19,22 +19,9 @@
# #
import os
import sys
import yum import yum
import subprocess
import datetime import datetime
import shlex
import re
import traceback import traceback
import syslog
try:
import json
except ImportError:
import simplejson as json
def yum_base(conf_file=None, cachedir=False): def yum_base(conf_file=None, cachedir=False):
my = yum.YumBase() my = yum.YumBase()
@ -289,73 +276,50 @@ def main():
# list=repos # list=repos
# list=pkgspec # list=pkgspec
if len(sys.argv) == 1: module = AnsibleModule(
msg = "the yum module requires arguments (-a)" argument_spec = dict()
return 1, msg )
argfile = sys.argv[1] params = module.params
if not os.path.exists(argfile): usage = "The module expects arguments of the following forms: state=<installed|removed|latest> pkg=<pkgspec> OR list=<installed|updates|available|repos|pkgspec>. pkgspec is nothing but the package specification. Example: google-chrome-stable.i386"
msg = "Argument file not found"
return 1, msg
args = open(argfile, 'r').read() if not len(params):
items = shlex.split(args) module.fail_json(msg=usage)
syslog.openlog('ansible-%s' % os.path.basename(__file__))
syslog.syslog(syslog.LOG_NOTICE, 'Invoked with %s' % args)
if not len(items):
msg = "the yum module requires arguments (-a)"
return 1, msg
# if nothing else changes - it fails # if nothing else changes - it fails
results = { 'changed':False, results = { 'changed':False,
'failed':True, 'failed':True,
'results':'', 'results':'',
'errors':'', 'errors':'',
'msg':args } 'msg':usage }
params = {}
for x in items:
try:
(k, v) = x.split("=", 1)
except ValueError:
msg = "invalid arguments: %s" % args
return 1, msg
params[k] = v
if 'conf_file' not in params: if 'conf_file' not in params:
params['conf_file'] = None params['conf_file'] = None
if 'list' in params: if 'list' in params:
try: try:
my = yum_base(conf_file=params['conf_file'], cachedir=True) my = yum_base(conf_file=params['conf_file'], cachedir=True)
results = dict(results=list_stuff(my, params['list'])) results = dict(results=list_stuff(my, params['list']))
except Exception, e: except Exception, e:
return 1, str(e) module.fail_json(msg=str(e))
else: else:
pkg = params.get('pkg', params.get('package', params.get('name', None))) pkg = params.get('pkg', params.get('package', params.get('name', None)))
if 'pkg' is None: if 'pkg' is None:
results['msg'] = "No pkg specified" module.fail_json(msg=usage)
else: else:
try: try:
my = yum_base(conf_file=params['conf_file'], cachedir=True) my = yum_base(conf_file=params['conf_file'], cachedir=True)
state = params.get('state', 'installed') state = params.get('state', 'installed')
results = ensure(my, state, pkg) results = ensure(my, state, pkg)
except Exception, e: except Exception, e:
return 1, str(e) module.fail_json(msg=str(e))
print json.dumps(results) module.exit_json(**results)
return 0, None
if __name__ == "__main__":
rc, msg = main()
if rc != 0: # something went wrong emit the msg
print json.dumps({
"failed" : rc,
"msg" : msg
})
sys.exit(rc)
# this is magic, see lib/ansible/module_common.py
#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
main()