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

Merge pull request #573 from sfromm/user

Browse source 
Minor tweak to user module
This commit is contained in:
Michael DeHaan 2012-07-11 05:26:26 -07:00
commit 36177cc935
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
library/user
View file

@ -310,20 +310,16 @@ if append not in [ 'yes', 'no' ]:
if name is None: if name is None:
fail_json(msg='name is required') fail_json(msg='name is required')
result = {} rc = None
rc = 0
out = '' out = ''
err = '' err = ''
result = {}
result['name'] = name result['name'] = name
if state == 'absent': if state == 'absent':
if not user_exists(name): if user_exists(name):
result['changed'] = False
else:
(rc, out, err) = user_del(name, force=force, remove=remove) (rc, out, err) = user_del(name, force=force, remove=remove)
if rc != 0: if rc != 0:
fail_json(name=name, msg=err) fail_json(name=name, msg=err)
else:
result['changed'] = True
result['force'] = force result['force'] = force
result['remove'] = remove result['remove'] = remove
elif state == 'present': elif state == 'present':
@ -338,13 +334,13 @@ elif state == 'present':
password=password, append=append) password=password, append=append)
if rc is not None and rc != 0: if rc is not None and rc != 0:
fail_json(name=name, msg=err) fail_json(name=name, msg=err)
if rc is None:
result['changed'] = False
else:
result['changed'] = True
if password is not None: if password is not None:
result['password'] = 'NOTLOGGINGPASSWORD' result['password'] = 'NOTLOGGINGPASSWORD'
if rc is None:
result['changed'] = False
else:
result['changed'] = True
if out: if out:
result['stdout'] = out result['stdout'] = out
if err: if err: