Skip to content

Commit 1c8bbf1

Browse files
committed
Merge pull request #2 from hellofresh/feature/fix-non-replicate-cmd-issues
Preventing errors when not using replicate command.
2 parents 62044ed + 46d00d8 commit 1c8bbf1

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

defaults/main.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,10 @@ aws_rds_instance_type : "db.t2.micro"
3434
aws_rds_wait : "true"
3535

3636

37+
aws_rds_command : "create"
38+
39+
40+
# High wait timeout because RDS takes it's time.
41+
aws_rds_wait_timeout : 900
42+
3743
#aws_rds_vpc_subnet

tasks/rds.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
port: "{{ aws_rds_port | default(omit) }}"
3131
iops: "{{ aws_rds_iops | default(omit) }}"
3232
character_set_name: "{{ aws_rds_character_set_name | default(omit) }}"
33-
register: rds_server
33+
register: rds_server_others
3434
when: aws_rds_command != 'replicate'
3535

3636

@@ -61,3 +61,9 @@
6161
character_set_name: "{{ aws_rds_character_set_name | default(omit) }}"
6262
register: rds_server
6363
when: aws_rds_command == 'replicate'
64+
65+
- name: Set fact if command is not replicate
66+
set_fact:
67+
# Overwrite rds_server variable with actual run result for later usage by other roles (e.g. aws-route53).
68+
rds_server={{rds_server_others}}
69+
when: aws_rds_command != 'replicate'

0 commit comments

Comments
 (0)