Skip to content

Commit

Permalink
Ra cert fix for prod env (#106)
Browse files Browse the repository at this point in the history
* Hardcoded service name to 'Lira' and made a change to fix the domain for the TLS cert created for Prod

* removing debug statement for the bash script used to create caas service accounts

* Adding a missing semicolon

* adding submit and hold variable for Falcon

* streamlining the lira variable by combinging the lira version and the lira docker image tag

* adding missing , to fix json file
  • Loading branch information
rhiananthony authored Sep 12, 2018
1 parent 5d5701e commit 6989055
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion kubernetes/create_caas_service_accounts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"}
Expand Down Expand Up @@ -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}

Expand Down
2 changes: 1 addition & 1 deletion kubernetes/lira-config.json.ctmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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" }}",
Expand Down

0 comments on commit 6989055

Please sign in to comment.