diff --git a/terraform/modules/services/forecast_generic/ecs.tf b/terraform/modules/services/forecast_generic/ecs.tf index 9d8fc019..81d04694 100644 --- a/terraform/modules/services/forecast_generic/ecs.tf +++ b/terraform/modules/services/forecast_generic/ecs.tf @@ -34,6 +34,7 @@ resource "aws_ecs_task_definition" "ecs-task-definition" { {"name": "ENVIRONMENT", "value": var.environment}, {"name": "OCF_ENVIRONMENT", "value": var.environment}, {"name": "USE_ADJUSTER", "value": var.use_adjuster}, + {"name": "SAVE_GSP_SUM", "value": var.pvnet_gsp_sum}, ] secrets : [ diff --git a/terraform/modules/services/forecast_generic/variables.tf b/terraform/modules/services/forecast_generic/variables.tf index 0d7a406d..36a4d271 100644 --- a/terraform/modules/services/forecast_generic/variables.tf +++ b/terraform/modules/services/forecast_generic/variables.tf @@ -121,4 +121,10 @@ variable "use_adjuster" { type = string description = "Whether to use the adjuster" default = "true" +} + +variable "pvnet_gsp_sum" { + type = string + description = "Whether to make the pvnet_gsp_sum" + default = "false" } \ No newline at end of file diff --git a/terraform/modules/services/internal_ui/docker-compose.yml b/terraform/modules/services/internal_ui/docker-compose.yml index 96c85256..685a80c9 100644 --- a/terraform/modules/services/internal_ui/docker-compose.yml +++ b/terraform/modules/services/internal_ui/docker-compose.yml @@ -11,6 +11,7 @@ services: ENVIRONMENT: $ENVIRONMENT AUTH0_DOMAIN: $AUTH0_DOMAIN AUTH0_CLIENT_ID: $AUTH0_CLIENT_ID + SHOW_PVNET_GSP_SUM: ${SHOW_PVNET_GSP_SUM} container_name: ${EB_APP_NAME} ports: - 80:8501 diff --git a/terraform/modules/services/internal_ui/eb.tf b/terraform/modules/services/internal_ui/eb.tf index 82f6c81f..d716bc46 100644 --- a/terraform/modules/services/internal_ui/eb.tf +++ b/terraform/modules/services/internal_ui/eb.tf @@ -93,6 +93,12 @@ resource "aws_elastic_beanstalk_environment" "eb-env" { value = var.auth_config.auth0_domain } + setting { + namespace = "aws:elasticbeanstalk:application:environment" + name = "SHOW_PVNET_GSP_SUM" + value = var.show_pvnet_gsp_sum + } + # =========== EB Settings =========== # setting { diff --git a/terraform/modules/services/internal_ui/variables.tf b/terraform/modules/services/internal_ui/variables.tf index b57edac8..fd201e73 100644 --- a/terraform/modules/services/internal_ui/variables.tf +++ b/terraform/modules/services/internal_ui/variables.tf @@ -68,4 +68,9 @@ variable "auth_config" { auth0_client_id : "Auth0 Client id" } EOT -} \ No newline at end of file +} + +variable "show_pvnet_gsp_sum" { + description = "If to use the pvnet gsp sum" + default = "false" +} diff --git a/terraform/nowcasting/development/main.tf b/terraform/nowcasting/development/main.tf index 0e22332d..8addc478 100644 --- a/terraform/nowcasting/development/main.tf +++ b/terraform/nowcasting/development/main.tf @@ -181,6 +181,7 @@ module "metrics" { database_secret = module.database.forecast-database-secret docker_version = var.metrics_version iam-policy-rds-read-secret = module.database.iam-policy-forecast-db-read + use_pvnet_gsp_sum = "true" } @@ -273,7 +274,7 @@ module "forecast_pvnet" { datadir = "data/latest" } loglevel= "INFO" - + pvnet_gsp_sum = "true" } module "analysis_dashboard" { @@ -299,6 +300,7 @@ module "analysis_dashboard" { auth0_domain = var.auth_domain auth0_client_id = var.auth_dashboard_client_id } + show_pvnet_gsp_sum = "true" } module "forecast_blend" {