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

fixes to code to enable updates of user to groups and delete groups. Fixed example yaml to use groups

Browse source
This commit is contained in:
toninog 2015-06-09 15:27:15 +01:00
parent ccfc9d2f6b
commit fccc925ec5
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cloud/amazon/iam.py
View file

@ -133,7 +133,7 @@ task:
iam_type: user iam_type: user
name: jdavila name: jdavila
state: update state: update
group: "{{ item.created_group.group_name }}" groups: "{{ item.created_group.group_name }}"
with_items: new_groups.results with_items: new_groups.results
''' '''
@ -376,7 +376,7 @@ new_name=None):
return (groups, changed) return (groups, changed)
def create_group(module, iam, name, path): def create_group(module=None, iam=None, name=None, path=None):
changed = False changed = False
try: try:
iam.create_group( iam.create_group(
@ -388,7 +388,7 @@ def create_group(module, iam, name, path):
return name, changed return name, changed
def delete_group(module, iam, name): def delete_group(module=None, iam=None, name=None):
changed = False changed = False
try: try:
iam.delete_group(name) iam.delete_group(name)
@ -414,8 +414,7 @@ def delete_group(module, iam, name):
changed = True changed = True
return changed, name return changed, name
def update_group(module=None, iam=None, name=None, new_name=None, new_path=None):
def update_group(module, iam, name, new_name, new_path):
changed = False changed = False
try: try:
current_group_path = iam.get_group( current_group_path = iam.get_group(
@ -663,11 +662,11 @@ 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, name, path) new_group, changed = create_group(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, name, new_name, new_path) 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,
@ -691,7 +690,7 @@ def main():
changed=changed, msg="Update Failed. Group %s doesn't seem to exit!" % name) changed=changed, msg="Update Failed. Group %s doesn't seem to exit!" % 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, name) removed_group, changed = delete_group(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")