Merge branch 'main' into s3-site-database

openclimatefix · Nov 13, 2024 · 4a68905 · 4a68905
2 parents 1680496 + 2526025
commit 4a68905
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/terraform/india/production/main.tf b/terraform/india/production/main.tf
@@ -372,7 +372,7 @@ module "forecast-ad" {
 
 # 5.0
 module "airflow" {
-  source                    = "github.com/openclimatefix/ocf-infrastructure//terraform/modules/services/airflow?ref=41a9ecf"
+  source                    = "github.com/openclimatefix/ocf-infrastructure//terraform/modules/services/airflow?ref=c73cee9"
   aws-environment           = local.environment
   aws-region                = local.region
   aws-domain                = local.domain

diff --git a/terraform/nowcasting/production/main.tf b/terraform/nowcasting/production/main.tf
@@ -62,7 +62,7 @@ module "ec2-bastion" {
 
 # 0.3
 module "s3" {
-  source = "github.com/openclimatefix/ocf-infrastructure//terraform/modules/storage/s3-trio?ref=2747e85"
+  source = "github.com/openclimatefix/ocf-infrastructure//terraform/modules/storage/s3-trio?ref=17f0d59"
 
   region      = var.region
   environment = local.environment
@@ -145,10 +145,10 @@ import {
 }
 
 # 3.2
-module "nwp-national" {
+module "nwp-metoffice" {
   source = "github.com/openclimatefix/ocf-infrastructure//terraform/modules/services/ecs_task?ref=26e3b29"
 
-  ecs-task_name = "nwp-national"
+  ecs-task_name = "nwp-metoffice"
   ecs-task_type = "consumer"
   ecs-task_execution_role_arn = module.ecs.ecs_task_execution_role_arn
   ecs-task_size = {
@@ -182,8 +182,8 @@ module "nwp-national" {
     "download",
     "--source=metoffice",
     "--sink=s3",
-    "--rdir=raw-national",
-    "--zdir=data-national",
+    "--rdir=raw-metoffice",
+    "--zdir=data-metoffice",
     "--create-latest"
   ]
 }
@@ -491,7 +491,7 @@ module "national_forecast" {
   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-national"
+    datadir                = "data-metoffice"
   }
   ecs-task_execution_role_arn = module.ecs.ecs_task_execution_role_arn
   sentry_dsn = var.sentry_dsn
@@ -521,7 +521,7 @@ module "forecast_pvnet" {
   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-national"
+    datadir                = "data-metoffice"
   }
   s3_satellite_bucket = {
     bucket_id              = module.s3.s3-sat-bucket.id
@@ -613,7 +613,7 @@ module "forecast_pvnet_day_ahead" {
   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-national"
+    datadir                = "data-metoffice"
   }
   s3_satellite_bucket = {
     bucket_id              = module.s3.s3-sat-bucket.id
@@ -681,7 +681,7 @@ module "forecast_blend" {
 
 # 5.2
 module "airflow" {
-  source = "github.com/openclimatefix/ocf-infrastructure//terraform/modules/services/airflow?ref=10a162d"
+  source = "github.com/openclimatefix/ocf-infrastructure//terraform/modules/services/airflow?ref=2c9c35f"
 
   aws-environment   = local.environment
   aws-domain        = local.domain
@@ -772,7 +772,7 @@ module "pvsite_forecast" {
   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-national"
+    datadir                = "data-metoffice"
   }
   ecs-task_execution_role_arn = module.ecs.ecs_task_execution_role_arn
   sentry_dsn = var.sentry_dsn