diff --git a/roles/aws/aws_rds/defaults/main.yml b/roles/aws/aws_rds/defaults/main.yml index 0649b2478..392647906 100644 --- a/roles/aws/aws_rds/defaults/main.yml +++ b/roles/aws/aws_rds/defaults/main.yml @@ -17,7 +17,7 @@ aws_rds: aurora_suffix: blue # appended to cluster name to create a unique instance name for the first (initially write) instance. aurora_reader: false # If true, an Aurora reader instance will be created. aurora_reader_suffix: green # appended to cluster name to create unique instance name for the second (initially read-only) instance - must not match aurora_suffix. - db_cluster_identifier: "{{ aws_rds.name }}" + # db_cluster_identifier: example # Default is RDS name. # See parameter group docs: https://docs.ansible.com/ansible/latest/collections/community/aws/rds_param_group_module.html # db_parameter_group_name: "example" # Omit to use default. # db_parameter_group_description: "Custom parameter group" # Description of parameter group. diff --git a/roles/aws/aws_rds/tasks/main.yml b/roles/aws/aws_rds/tasks/main.yml index 3fdeb1772..bac008c02 100644 --- a/roles/aws/aws_rds/tasks/main.yml +++ b/roles/aws/aws_rds/tasks/main.yml @@ -27,7 +27,7 @@ amazon.aws.rds_instance: db_instance_identifier: "{{ aws_rds.name }}-{{ aws_rds.aurora_suffix }}" db_instance_class: "{{ aws_rds.db_instance_class }}" - db_cluster_identifier: "{{ aws_rds.db_cluster_identifier }}" + db_cluster_identifier: "{{ aws_rds.db_cluster_identifier | default(aws_rds.name) }}" db_parameter_group_name: "{{ aws_rds.db_parameter_group_name | default(omit) }}" state: "{{ aws_rds.state }}" engine: "{{ aws_rds.engine }}" @@ -46,7 +46,7 @@ - name: Create Aurora RDS reader instance. amazon.aws.rds_instance: db_instance_identifier: "{{ aws_rds.name }}-{{ aws_rds.aurora_reader_suffix }}" - db_cluster_identifier: "{{ aws_rds.db_cluster_identifier }}" + db_cluster_identifier: "{{ aws_rds.db_cluster_identifier | default(aws_rds.name) }}" db_instance_class: "{{ aws_rds.db_instance_class }}" db_parameter_group_name: "{{ aws_rds.db_parameter_group_name | default(omit) }}" state: "{{ aws_rds.state }}"