EKS: Wait for DB instance before creating databases

Author: flaviodsr

infra/terraform/EKS/modules/postgresql/main.tf

@@ -56,23 +56,24 @@ resource "aws_rds_cluster" "aurora" {
 }
 
 resource "aws_rds_cluster_instance" "postgresql" {
-  cluster_identifier     = aws_rds_cluster.aurora.id
-  engine                 = aws_rds_cluster.aurora.engine
-  engine_version         = aws_rds_cluster.aurora.engine_version
-  instance_class         = "db.t3.medium"
-  #vpc_security_group_ids = [aws_security_group.allow_psql.id]
+  cluster_identifier = aws_rds_cluster.aurora.id
+  engine             = aws_rds_cluster.aurora.engine
+  engine_version     = aws_rds_cluster.aurora.engine_version
+  instance_class     = "db.t3.medium"
 
-  publicly_accessible    = true
+  publicly_accessible = true
+  depends_on          = [aws_rds_cluster.aurora]
 }
 
 resource "null_resource" "create_databases" {
   for_each = toset(var.databases)
 
   provisioner "local-exec" {
-    command = "createdb -h ${aws_rds_cluster.aurora.endpoint} -U ${var.administrator_login} ${each.value}"
+    command = "until getent hosts ${aws_rds_cluster.aurora.endpoint}; do sleep 5; done; createdb -h ${aws_rds_cluster.aurora.endpoint} -U ${var.administrator_login} ${each.value}"
 
     environment = {
       PGPASSWORD = random_password.db_password.result
     }
   }
+  depends_on = [aws_rds_cluster_instance.postgresql]
 }

tests/registry/ha+tls+external-db_redis/infra.tfvars

@@ -1,4 +1,4 @@
-k8s_enabled = true
-db_enabled = true
+k8s_enabled            = true
+db_enabled             = true
 object_storage_enabled = true
-redis_enabled = true
+redis_enabled          = true