Merge pull request #4274 from ministryofjustice/DBA-584

Dba 584
ministryofjustice · Dec 8, 2023 · 89095c2 · 89095c2
2 parents 7af1d61 + e354de6
commit 89095c2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...m/environments/delius-core/modules/environment_all_components/templates/userdata.sh.tftpl b/...m/environments/delius-core/modules/environment_all_components/templates/userdata.sh.tftpl
@@ -61,7 +61,7 @@ run_ansible() {
     then
       group=$(echo "$${environment_name}_$${delius_environment_name}_$${database}" | tr [:upper:] [:lower:] | sed "s/-/_/g")
       group_all=$(echo "$${environment_name}_$${delius_environment_name}_all" | tr [:upper:] [:lower:] | sed "s/-/_/g")
-      database_type=$(echo $database | cut -d'_' -f2 | sed "s/db//g")
+      [[ $database =~ "primarydb" ]] && database_type="primary" || database_type="standby"
       ansible_group_vars="$ansible_group_vars --extra-vars @group_vars/$group.yml --extra-vars @group_vars/$group_all.yml --extra-vars database_type=$database_type"
     elif [[ $i -gt 2 ]]
     then

diff --git a/terraform/environments/delius-core/templates/userdata.sh.tftpl b/terraform/environments/delius-core/templates/userdata.sh.tftpl
@@ -61,7 +61,7 @@ run_ansible() {
     then
       group=$(echo "$${environment_name}_$${delius_environment_name}_$${database}" | tr [:upper:] [:lower:] | sed "s/-/_/g")
       group_all=$(echo "$${environment_name}_$${delius_environment_name}_all" | tr [:upper:] [:lower:] | sed "s/-/_/g")
-      database_type=$(echo $database | cut -d'_' -f2 | sed "s/db//g")
+      [[ $database =~ "primarydb" ]] && database_type="primary" || database_type="standby"
       ansible_group_vars="$ansible_group_vars --extra-vars @group_vars/$group.yml --extra-vars @group_vars/$group_all.yml --extra-vars database_type=$database_type"
     elif [[ $i -gt 2 ]]
     then