diff --git a/kubernetes/create_caas_service_accounts.sh b/kubernetes/create_caas_service_accounts.sh index 0e9a6e46..0c6a30c3 100755 --- a/kubernetes/create_caas_service_accounts.sh +++ b/kubernetes/create_caas_service_accounts.sh @@ -2,6 +2,7 @@ # This script creates service accounts in the specified gcloud project # It then registers it in both FireCloud and SAM for use with Cromwell-as-a-Service (CaaS). + # Variables LIRA_ENVIRONMENT=${LIRA_ENVIRONMENT:-""} GCLOUD_PROJECT=${GCLOUD_PROJECT:-"broad-dsde-mint-${LIRA_ENVIRONMENT}"} @@ -43,7 +44,6 @@ SVC_ACCOUNT_EMAIL="${SVC_ACCOUNT_NAME}@${GCLOUD_PROJECT}.iam.gserviceaccount.com SVC_ACCOUNT_KEY="${CAAS_ENVIRONMENT}-key.json" SVC_ACCOUNT_VAULT_KEY_PATH="secret/dsde/mint/${LIRA_ENVIRONMENT}/lira/${SVC_ACCOUNT_KEY}" - #Set gcloud project gcloud config set project ${GCLOUD_PROJECT} diff --git a/kubernetes/lira-config.json.ctmpl b/kubernetes/lira-config.json.ctmpl index d159bbc0..d378ca8e 100644 --- a/kubernetes/lira-config.json.ctmpl +++ b/kubernetes/lira-config.json.ctmpl @@ -16,7 +16,7 @@ "version": "{{ env "LIRA_VERSION" }}", "MAX_CONTENT_LENGTH": 10000, "use_caas": {{ env "USE_CAAS" | parseBool }}, - "submit_and_hold": {{ env "SUBMIT_AND_HOLD" | parseBool }} + "submit_and_hold": {{ env "SUBMIT_AND_HOLD" | parseBool }}, "env": "{{ $ENVIRONMENT }}", "dss_url": "{{ env "DSS_URL" }}", "schema_url": "{{ env "SCHEMA_URL" }}",