summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Davila <jonathan@davila.io>2017-05-14 17:29:44 -0400
committerGitHub <noreply@github.com>2017-05-14 17:29:44 -0400
commit6410e139037db14189a47173b90fe110566f69d9 (patch)
treea508059274c44ce198dd6856e0fa93637da84e09
parentf9b44990829c5d17d1ee5f0cb4a5dcc16bcc1aca (diff)
downloadansible-6410e139037db14189a47173b90fe110566f69d9.tar.gz
Fix bug in iam_role (#22618)
-rw-r--r--lib/ansible/modules/cloud/amazon/iam_role.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ansible/modules/cloud/amazon/iam_role.py b/lib/ansible/modules/cloud/amazon/iam_role.py
index a1b8ea0739..cf837b4f50 100644
--- a/lib/ansible/modules/cloud/amazon/iam_role.py
+++ b/lib/ansible/modules/cloud/amazon/iam_role.py
@@ -190,7 +190,7 @@ def create_or_update_role(connection, module):
changed = False
# Get role
- role = get_role(connection, params['RoleName'])
+ role = get_role(connection, params['RoleName'], module)
# If role is None, create it
if role is None:
@@ -258,7 +258,7 @@ def create_or_update_role(connection, module):
connection.add_role_to_instance_profile(InstanceProfileName=params['RoleName'], RoleName=params['RoleName'])
# Get the role again
- role = get_role(connection, params['RoleName'])
+ role = get_role(connection, params['RoleName'], module)
role['attached_policies'] = get_attached_policy_list(connection, params['RoleName'])
module.exit_json(changed=changed, iam_role=camel_dict_to_snake_dict(role))
@@ -269,7 +269,7 @@ def destroy_role(connection, module):
params = dict()
params['RoleName'] = module.params.get('name')
- if get_role(connection, params['RoleName']):
+ if get_role(connection, params['RoleName'], module):
# We need to remove any instance profiles from the role before we delete it
try:
@@ -301,7 +301,7 @@ def destroy_role(connection, module):
module.exit_json(changed=True)
-def get_role(connection, name):
+def get_role(connection, name, module):
params = dict()
params['RoleName'] = name