From 4906be100902d0b25de49bc5000f7dadc5973028 Mon Sep 17 00:00:00 2001 From: curry9999 Date: Fri, 26 Oct 2018 10:07:40 +0900 Subject: [PATCH] An error occurs if cluster_id is not specified (#47500) * modified: google/gcp_compute_backend_bucket.py modified: google/gcp_compute_backend_service.py modified: google/gcp_compute_forwarding_rule.py modified: google/gcp_compute_global_forwarding_rule.py modified: google/gcp_compute_image.py modified: google/gcp_compute_instance.py modified: google/gcp_compute_instance_group.py modified: google/gcp_compute_instance_group_manager.py modified: google/gcp_compute_instance_template.py modified: google/gcp_compute_route.py modified: google/gcp_compute_subnetwork.py modified: google/gcp_compute_target_http_proxy.py modified: google/gcp_compute_target_https_proxy.py modified: google/gcp_compute_target_ssl_proxy.py modified: google/gcp_compute_target_tcp_proxy.py modified: google/gcp_compute_url_map.py modified: google/gcp_container_node_pool.py modified: google/gcp_dns_resource_record_set.py modified: google/gcp_pubsub_subscription.py modified: google/gcp_storage_bucket_access_control.py * modified: lib/ansible/modules/cloud/amazon/aws_ses_identity.py modified: lib/ansible/modules/cloud/amazon/route53_facts.py modified: lib/ansible/modules/cloud/cloudscale/cloudscale_server.py modified: lib/ansible/modules/network/aos/_aos_logical_device.py modified: lib/ansible/modules/network/aos/_aos_rack_type.py modified: lib/ansible/modules/network/aos/_aos_template.py modified: lib/ansible/modules/network/cumulus/nclu.py modified: lib/ansible/modules/web_infrastructure/ansible_tower/tower_job_launch.py modified: lib/ansible/modules/web_infrastructure/ansible_tower/tower_job_wait.py * An error occurs if cluster_id is not specified * An error occurs if cluster_id is not specified --- changelogs/fragments/47500-rds_instance.yaml | 3 +++ lib/ansible/modules/cloud/amazon/rds_instance.py | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 changelogs/fragments/47500-rds_instance.yaml diff --git a/changelogs/fragments/47500-rds_instance.yaml b/changelogs/fragments/47500-rds_instance.yaml new file mode 100644 index 00000000000..052bf9c0840 --- /dev/null +++ b/changelogs/fragments/47500-rds_instance.yaml @@ -0,0 +1,3 @@ +--- +bugfixes: +- rds_instance - Cluster_id which is an alias of db_cluster_identifier is a mandatory check target. diff --git a/lib/ansible/modules/cloud/amazon/rds_instance.py b/lib/ansible/modules/cloud/amazon/rds_instance.py index 834b8521f6f..fee883ee732 100644 --- a/lib/ansible/modules/cloud/amazon/rds_instance.py +++ b/lib/ansible/modules/cloud/amazon/rds_instance.py @@ -1076,9 +1076,9 @@ def main(): arg_spec.update(parameter_options) required_if = [ - ('engine', 'aurora', ('cluster_id',)), - ('engine', 'aurora-mysql', ('cluster_id',)), - ('engine', 'aurora-postresql', ('cluster_id',)), + ('engine', 'aurora', ('db_cluster_identifier',)), + ('engine', 'aurora-mysql', ('db_cluster_identifier',)), + ('engine', 'aurora-postresql', ('db_cluster_identifier',)), ('creation_source', 'snapshot', ('snapshot_identifier', 'engine')), ('creation_source', 's3', ( 's3_bucket_name', 'engine', 'master_username', 'master_user_password',