From 6fc58855b931a29c2ec94efec1eacde2fd20a07d Mon Sep 17 00:00:00 2001 From: whiter Date: Thu, 15 Oct 2015 13:21:05 +1100 Subject: [PATCH] Allow iam_policy to maintain idempotentce if the role referenced has been removed --- cloud/amazon/iam_policy.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cloud/amazon/iam_policy.py b/cloud/amazon/iam_policy.py index 0d2ed506457..eeab1a7acd5 100644 --- a/cloud/amazon/iam_policy.py +++ b/cloud/amazon/iam_policy.py @@ -183,6 +183,14 @@ def role_action(module, iam, name, policy_name, skip, pdoc, state): current_policies = [cp for cp in iam.list_role_policies(name). list_role_policies_result. policy_names] + except boto.exception.BotoServerError as e: + if e.error_code == "NoSuchEntity": + # Role doesn't exist so it's safe to assume the policy doesn't either + module.exit_json(changed=False) + else: + module.fail_json(e.message) + + try: for pol in current_policies: if urllib.unquote(iam.get_role_policy(name, pol). get_role_policy_result.policy_document) == pdoc: