From b2df547cb74225f1127566527548f462571432c4 Mon Sep 17 00:00:00 2001 From: Dennis Bell Date: Mon, 1 Jun 2020 11:18:01 -0700 Subject: [PATCH] Fixed bugs in external database --- overlay/db/external-mysql.yml | 1 - overlay/db/external-postgres.yml | 1 - overlay/db/external.yml | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/overlay/db/external-mysql.yml b/overlay/db/external-mysql.yml index 8d876ed7..e605239c 100644 --- a/overlay/db/external-mysql.yml +++ b/overlay/db/external-mysql.yml @@ -3,5 +3,4 @@ params: external_db_host: (( param "Please provide the hostname / IP of your external MySQL database instance" )) external_db_scheme: mysql external_db_port: 3306 - external_db_username: ((external_db_username)) external_db_password: ((external_db_password)) diff --git a/overlay/db/external-postgres.yml b/overlay/db/external-postgres.yml index 22a05733..6045a459 100644 --- a/overlay/db/external-postgres.yml +++ b/overlay/db/external-postgres.yml @@ -3,7 +3,6 @@ params: external_db_host: (( param "Please provide the hostname / IP of your external MySQL database instance" )) external_db_scheme: postgres external_db_port: 5432 - external_db_username: ((external_db_username)) external_db_password: ((external_db_password)) # UAA is not a team player, wants to go its own way... diff --git a/overlay/db/external.yml b/overlay/db/external.yml index 814862f7..824b2546 100644 --- a/overlay/db/external.yml +++ b/overlay/db/external.yml @@ -2,7 +2,7 @@ params: uaadb_host: (( grab params.external_db_host )) uaadb_port: (( grab params.external_db_port )) - uaadb_user: (( grab params.external_db_username "uaa" )) + uaadb_user: (( grab params.external_db_username || "uaa" )) uaadb_password: (( grab params.external_db_password )) ccdb_host: (( grab params.external_db_host ))