change pvnet to use ecs_task (#703)

openclimatefix · Dec 3, 2024 · 2b4887c · 2b4887c
1 parent 1c2a5cb
commit 2b4887c
Showing 1 changed file with 47 additions and 33 deletions.
diff --git a/terraform/nowcasting/development/main.tf b/terraform/nowcasting/development/main.tf
@@ -545,41 +545,55 @@ source = "../../modules/services/ecs_task"
 
 # 4.4
 module "forecast_pvnet" {
-  source = "../../modules/services/forecast_generic"
+source = "../../modules/services/ecs_task"
 
-  region      = var.region
-  environment = local.environment
-  app-name    = "forecast_pvnet"
-  ecs_config  = {
-    docker_image   = "openclimatefix/pvnet_app"
-    docker_version = var.forecast_pvnet_version
-    memory_mb      = 8192
-    cpu            = 2048
-  }
-  rds_config = {
-    database_secret_arn             = module.database.forecast-database-secret.arn
-    database_secret_read_policy_arn = module.database.iam-policy-forecast-db-read.arn
-  }
-  s3_ml_bucket = {
-    bucket_id              = module.forecasting_models_bucket.bucket_id
-    bucket_read_policy_arn = module.forecasting_models_bucket.read_policy_arn
-  }
-  s3_nwp_bucket = {
-    bucket_id              = module.s3.s3-nwp-bucket.id
-    bucket_read_policy_arn = module.s3.iam-policy-s3-nwp-read.arn
-    datadir                = "data-metoffice"
-  }
-  s3_satellite_bucket = {
-    bucket_id              = module.s3.s3-sat-bucket.id
-    bucket_read_policy_arn = module.s3.iam-policy-s3-sat-read.arn
-    datadir                = "data/latest"
-  }
-  loglevel      = "INFO"
-  pvnet_gsp_sum = "true"
+  aws-region                    = var.region
+  aws-environment               = local.environment
+
+  s3-buckets = [
+    {
+      id : module.s3.s3-nwp-bucket.id,
+      access_policy_arn : module.s3.iam-policy-s3-nwp-read.arn
+    },
+    {
+      id : module.s3.s3-sat-bucket.id,
+      access_policy_arn : module.s3.iam-policy-s3-sat-read.arn
+    }
+  ]
+
+  ecs-task_name               = "forecast_pvnet"
+  ecs-task_type               = "forecast"
   ecs-task_execution_role_arn = module.ecs.ecs_task_execution_role_arn
-  run_extra_models = "true"
-  sentry_dsn = var.sentry_dsn
-  use_data_sample = "true"
+  ecs-task_size = {
+    memory = 8192
+    cpu    = 2048
+  }
+
+  container-env_vars = [
+    { "name" : "AWS_REGION", "value" : var.region },
+    { "name" : "ENVIRONMENT", "value" : local.environment },
+    { "name" : "LOGLEVEL", "value" : "INFO" },
+    { "name" : "NWP_ECMWF_ZARR_PATH", "value": "s3://${module.s3.s3-nwp-bucket.id}/ecmwf/data/latest.zarr" },
+    { "name" : "NWP_UKV_ZARR_PATH", "value":"s3://${module.s3.s3-nwp-bucket.id}/data-metoffice/latest.zarr"},
+    { "name" : "SATELLITE_ZARR_PATH", "value":"s3://${module.s3.s3-sat-bucket.id}/data/latest/latest.zarr.zip"},
+    { "name" : "SENTRY_DSN",  "value": var.sentry_dsn},
+    { "name" : "USE_ADJUSTER", "value": "true"},
+    { "name" : "SAVE_GSP_SUM", "value": "true"},
+    { "name" : "RUN_EXTRA_MODELS",  "value": "true"},
+    { "name" : "DAY_AHEAD_MODEL",  "value": "false"},
+    { "name" : "USE_OCF_DATA_SAMPLER", "value": "true"}
+  ]
+
+  container-secret_vars = [
+       {secret_policy_arn: module.database.forecast-database-secret.arn,
+        values: ["DB_URL"]
+       }
+       ]
+
+  container-tag         = var.forecast_pvnet_version
+  container-name        = "openclimatefix/pvnet_app"
+  container-registry    = "docker.io"
+  container-command     = []
 }
 
 # 4.5