diff --git a/meta/runtime.yml b/meta/runtime.yml index bd0c5d44e08..e4ff3a4cee6 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -9,17 +9,10 @@ action_groups: - aws_s3 - backup_plan - backup_plan_info -<<<<<<< HEAD - backup_tag - backup_tag_info - backup_selection - backup_selection_info -======= - - backup_selection - - backup_selection_info - - backup_tag - - backup_tag_info ->>>>>>> e8209bfb (promote iam_managed_policy) - backup_vault - backup_vault_info - cloudformation @@ -27,19 +20,12 @@ action_groups: - cloudtrail - cloudtrail_info - cloudwatch_metric_alarm -<<<<<<< HEAD -======= - - cloudwatch_metric_alarm_info ->>>>>>> e8209bfb (promote iam_managed_policy) - cloudwatchevent_rule - cloudwatchevent_rule - cloudwatchlogs_log_group - cloudwatchlogs_log_group_info - cloudwatchlogs_log_group_metric_filter -<<<<<<< HEAD - cloudwatch_metric_alarm_info -======= ->>>>>>> e8209bfb (promote iam_managed_policy) - ec2_ami - ec2_ami_info - ec2_eip @@ -87,6 +73,8 @@ action_groups: - iam_managed_policy - iam_policy - iam_policy_info + - iam_role + - iam_role_info - iam_user - iam_user_info - kms_key diff --git a/plugins/modules/iam_managed_policy.py b/plugins/modules/iam_managed_policy.py index c3aa5ef597b..f1d8e55f9ce 100644 --- a/plugins/modules/iam_managed_policy.py +++ b/plugins/modules/iam_managed_policy.py @@ -137,7 +137,7 @@ from ansible_collections.amazon.aws.plugins.module_utils.policy import compare_policies from ansible_collections.amazon.aws.plugins.module_utils.retries import AWSRetry -from ansible_collections.community.aws.plugins.module_utils.modules import AnsibleCommunityAWSModule as AnsibleAWSModule +from ansible_collections.amazon.aws.plugins.module_utils.modules import AnsibleAWSModule @AWSRetry.jittered_backoff(retries=5, delay=5, backoff=2.0)