diff --git a/api/environment.tpl b/api/environment.tpl index ed4a9379a..2dd750c1b 100644 --- a/api/environment.tpl +++ b/api/environment.tpl @@ -1,4 +1,5 @@ SYSTEM_VERSION=${{SYSTEM_VERSION}} +STAGE=${{STAGE}} DJANGO_SECRET_KEY=${{DJANGO_SECRET_KEY}} DJANGO_DEBUG=${{DJANGO_DEBUG}} DATABASE_PORT=${{DATABASE_PORT}} diff --git a/infrastructure/networking.tf b/infrastructure/networking.tf index 201443f3a..3a886f10e 100644 --- a/infrastructure/networking.tf +++ b/infrastructure/networking.tf @@ -101,7 +101,7 @@ resource "aws_db_subnet_group" "data_refinery" { # Get the API a static IP address. resource "aws_eip" "data_refinery_api_ip" { - domain = "vpc" + vpc = true tags = merge( var.default_tags, diff --git a/workers/batch-job-templates/affy_to_pcl.tpl.json b/workers/batch-job-templates/affy_to_pcl.tpl.json index a80cd16d3..31d7b50c0 100644 --- a/workers/batch-job-templates/affy_to_pcl.tpl.json +++ b/workers/batch-job-templates/affy_to_pcl.tpl.json @@ -29,6 +29,7 @@ "jobRoleArn": "${{WORKER_ROLE_ARN}}", "environment": [ {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"}, + {"name": "STAGE", "value": "${{STAGE}}"}, {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"}, {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"}, {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"}, diff --git a/workers/batch-job-templates/create_compendia.tpl.json b/workers/batch-job-templates/create_compendia.tpl.json index 748b56a4c..7640deb3f 100644 --- a/workers/batch-job-templates/create_compendia.tpl.json +++ b/workers/batch-job-templates/create_compendia.tpl.json @@ -29,6 +29,7 @@ "jobRoleArn": "${{WORKER_ROLE_ARN}}", "environment": [ {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"}, + {"name": "STAGE", "value": "${{STAGE}}"}, {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"}, {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"}, {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"}, diff --git a/workers/batch-job-templates/create_qn_target.tpl.json b/workers/batch-job-templates/create_qn_target.tpl.json index fe4d089e1..4e41cb142 100644 --- a/workers/batch-job-templates/create_qn_target.tpl.json +++ b/workers/batch-job-templates/create_qn_target.tpl.json @@ -29,6 +29,7 @@ "jobRoleArn": "${{WORKER_ROLE_ARN}}", "environment": [ {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"}, + {"name": "STAGE", "value": "${{STAGE}}"}, {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"}, {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"}, {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"}, diff --git a/workers/batch-job-templates/create_quantpendia.tpl.json b/workers/batch-job-templates/create_quantpendia.tpl.json index 6e28baeec..3a55b4b58 100644 --- a/workers/batch-job-templates/create_quantpendia.tpl.json +++ b/workers/batch-job-templates/create_quantpendia.tpl.json @@ -29,6 +29,7 @@ "jobRoleArn": "${{WORKER_ROLE_ARN}}", "environment": [ {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"}, + {"name": "STAGE", "value": "${{STAGE}}"}, {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"}, {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"}, {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"}, diff --git a/workers/batch-job-templates/downloader.tpl.json b/workers/batch-job-templates/downloader.tpl.json index 6a434dd28..0d852f121 100644 --- a/workers/batch-job-templates/downloader.tpl.json +++ b/workers/batch-job-templates/downloader.tpl.json @@ -29,6 +29,7 @@ "jobRoleArn": "${{WORKER_ROLE_ARN}}", "environment": [ {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"}, + {"name": "STAGE", "value": "${{STAGE}}"}, {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"}, {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"}, {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"}, diff --git a/workers/batch-job-templates/illumina_to_pcl.tpl.json b/workers/batch-job-templates/illumina_to_pcl.tpl.json index 420806494..7ceab96fa 100644 --- a/workers/batch-job-templates/illumina_to_pcl.tpl.json +++ b/workers/batch-job-templates/illumina_to_pcl.tpl.json @@ -29,6 +29,7 @@ "jobRoleArn": "${{WORKER_ROLE_ARN}}", "environment": [ {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"}, + {"name": "STAGE", "value": "${{STAGE}}"}, {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"}, {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"}, {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"}, diff --git a/workers/batch-job-templates/janitor.tpl.json b/workers/batch-job-templates/janitor.tpl.json index a3825e7b4..3c2a8826e 100644 --- a/workers/batch-job-templates/janitor.tpl.json +++ b/workers/batch-job-templates/janitor.tpl.json @@ -29,6 +29,7 @@ "jobRoleArn": "${{WORKER_ROLE_ARN}}", "environment": [ {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"}, + {"name": "STAGE", "value": "${{STAGE}}"}, {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"}, {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"}, {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"}, diff --git a/workers/batch-job-templates/no_op.tpl.json b/workers/batch-job-templates/no_op.tpl.json index 39479d9d9..8d9325120 100644 --- a/workers/batch-job-templates/no_op.tpl.json +++ b/workers/batch-job-templates/no_op.tpl.json @@ -29,6 +29,7 @@ "jobRoleArn": "${{WORKER_ROLE_ARN}}", "environment": [ {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"}, + {"name": "STAGE", "value": "${{STAGE}}"}, {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"}, {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"}, {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"}, diff --git a/workers/batch-job-templates/qn_dispatcher.tpl.json b/workers/batch-job-templates/qn_dispatcher.tpl.json index fda7cd3d9..25bbbf72a 100644 --- a/workers/batch-job-templates/qn_dispatcher.tpl.json +++ b/workers/batch-job-templates/qn_dispatcher.tpl.json @@ -29,6 +29,7 @@ "jobRoleArn": "${{WORKER_ROLE_ARN}}", "environment": [ {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"}, + {"name": "STAGE", "value": "${{STAGE}}"}, {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"}, {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"}, {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"}, diff --git a/workers/batch-job-templates/qn_reference.tpl.json b/workers/batch-job-templates/qn_reference.tpl.json index c2ce930c4..eaf4bd425 100644 --- a/workers/batch-job-templates/qn_reference.tpl.json +++ b/workers/batch-job-templates/qn_reference.tpl.json @@ -29,6 +29,7 @@ "jobRoleArn": "${{WORKER_ROLE_ARN}}", "environment": [ {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"}, + {"name": "STAGE", "value": "${{STAGE}}"}, {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"}, {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"}, {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"}, diff --git a/workers/batch-job-templates/salmon.tpl.json b/workers/batch-job-templates/salmon.tpl.json index e04815ce4..cb2bdc6df 100644 --- a/workers/batch-job-templates/salmon.tpl.json +++ b/workers/batch-job-templates/salmon.tpl.json @@ -29,6 +29,7 @@ "jobRoleArn": "${{WORKER_ROLE_ARN}}", "environment": [ {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"}, + {"name": "STAGE", "value": "${{STAGE}}"}, {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"}, {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"}, {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"}, diff --git a/workers/batch-job-templates/smasher.tpl.json b/workers/batch-job-templates/smasher.tpl.json index 55941760d..53e750b20 100644 --- a/workers/batch-job-templates/smasher.tpl.json +++ b/workers/batch-job-templates/smasher.tpl.json @@ -29,6 +29,7 @@ "jobRoleArn": "${{WORKER_ROLE_ARN}}", "environment": [ {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"}, + {"name": "STAGE", "value": "${{STAGE}}"}, {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"}, {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"}, {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"}, diff --git a/workers/batch-job-templates/transcriptome_index.tpl.json b/workers/batch-job-templates/transcriptome_index.tpl.json index 2b79fde10..4832192d4 100644 --- a/workers/batch-job-templates/transcriptome_index.tpl.json +++ b/workers/batch-job-templates/transcriptome_index.tpl.json @@ -29,6 +29,7 @@ "jobRoleArn": "${{WORKER_ROLE_ARN}}", "environment": [ {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"}, + {"name": "STAGE", "value": "${{STAGE}}"}, {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"}, {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"}, {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"}, diff --git a/workers/batch-job-templates/tximport.tpl.json b/workers/batch-job-templates/tximport.tpl.json index 46fa2dd2f..4aeaa3f28 100644 --- a/workers/batch-job-templates/tximport.tpl.json +++ b/workers/batch-job-templates/tximport.tpl.json @@ -29,6 +29,7 @@ "jobRoleArn": "${{WORKER_ROLE_ARN}}", "environment": [ {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"}, + {"name": "STAGE", "value": "${{STAGE}}"}, {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"}, {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"}, {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"},