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

IAM group modules need module passed

Browse source 
The IAM group modules were not receiving the `module` object, but they
use `module.fail_json()` in their exception handlers. This patch passes
through the module object so the real errors from boto are exposed,
rather than errors about "NoneType has no method `fail_json`".
This commit is contained in:
Ryan S. Brown 2016-06-03 13:15:15 -04:00 committed by Matt Clay
parent 2090304511
commit a2e6ac6ca8
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/modules/cloud/amazon/iam.py
View file

@ -506,7 +506,7 @@ def create_role(module, iam, name, path, role_list, prof_list, trust_policy_doc)
path=path).create_role_response.create_role_result.role.role_name path=path).create_role_response.create_role_result.role.role_name
if name not in prof_list: if name not in prof_list:
instance_profile_result = iam.create_instance_profile(name, instance_profile_result = iam.create_instance_profile(name,
path=path).create_instance_profile_response.create_instance_profile_result.instance_profile path=path).create_instance_profile_response.create_instance_profile_result.instance_profile
iam.add_role_to_instance_profile(name, name) iam.add_role_to_instance_profile(name, name)
except boto.exception.BotoServerError as err: except boto.exception.BotoServerError as err:
@ -748,11 +748,12 @@ def main():
group_exists = name in orig_group_list group_exists = name in orig_group_list
if state == 'present' and not group_exists: if state == 'present' and not group_exists:
new_group, changed = create_group(iam=iam, name=name, path=path) new_group, changed = create_group(module=module, iam=iam, name=name, path=path)
module.exit_json(changed=changed, group_name=new_group) module.exit_json(changed=changed, group_name=new_group)
elif state in ['present', 'update'] and group_exists: elif state in ['present', 'update'] and group_exists:
changed, updated_name, updated_path, cur_path = update_group( changed, updated_name, updated_path, cur_path = update_group(
iam=iam, name=name, new_name=new_name, new_path=new_path) module=module, iam=iam, name=name, new_name=new_name,
new_path=new_path)
if new_path and new_name: if new_path and new_name:
module.exit_json(changed=changed, old_group_name=name, module.exit_json(changed=changed, old_group_name=name,
@ -774,11 +775,11 @@ def main():
elif state == 'update' and not group_exists: elif state == 'update' and not group_exists:
module.fail_json( module.fail_json(
changed=changed, msg="Update Failed. Group %s doesn't seem to exit!" % name) changed=changed, msg="Update Failed. Group %s doesn't seem to exist!" % name)
elif state == 'absent': elif state == 'absent':
if name in orig_group_list: if name in orig_group_list:
removed_group, changed = delete_group(iam=iam, name=name) removed_group, changed = delete_group(module=module, iam=iam, name=name)
module.exit_json(changed=changed, delete_group=removed_group) module.exit_json(changed=changed, delete_group=removed_group)
else: else:
module.exit_json(changed=changed, msg="Group already absent") module.exit_json(changed=changed, msg="Group already absent")