Consolidate all variables into region.hcl and fix variable references

Author: catherinevee

infrastructure/dev/us-east-2/compute/parallel-cluster/terragrunt.hcl

@@ -79,24 +79,19 @@ inputs = {
 
   # EFA Configuration
   efa = {
-    enabled = true
-    gdr_support = false  # Disabled for dev
+    enabled = local.efa_config.enabled
+    gdr_support = local.efa_config.enable_gpudirect
   }
 
   # Tags
-  tags = {
+  tags = merge(local.common_tags, {
     Name = local.cluster_name
     Type = "ParallelCluster"
     Purpose = "HPC-Compute"
-    Environment = local.environment
-    Region = local.region
-  }
+  })
 
   # Additional variables for local Terraform resources
   environment = local.environment
   region      = local.region
-  common_tags = {
-    Environment = local.environment
-    Region = local.region
-  }
+  common_tags = local.common_tags
 }

infrastructure/dev/us-east-2/monitoring/cloudwatch/terragrunt.hcl

@@ -23,42 +23,35 @@ dependency "kms" {
 inputs = {
   # CloudWatch Log Groups
   log_groups = {
-    hpc_system_logs = {
-      name              = "/aws/hpc/${local.environment}/system"
-      retention_in_days = local.monitoring.cloudwatch.log_retention_days
-      kms_key_id        = dependency.kms.outputs.kms_key_arn
-    }
-    hpc_application_logs = {
-      name              = "/aws/hpc/${local.environment}/application"
-      retention_in_days = local.monitoring.cloudwatch.log_retention_days
+    for name, config in local.cloudwatch_config.log_groups : name => {
+      name              = config.name
+      retention_in_days = config.retention_in_days
       kms_key_id        = dependency.kms.outputs.kms_key_arn
     }
   }
 
   # CloudWatch Alarms
   alarms = {
     high_queue_depth = {
-      alarm_name          = "hpc-${local.environment}-high-queue-depth"
-      comparison_operator = "GreaterThanThreshold"
-      evaluation_periods  = "2"
-      metric_name         = "JobsQueued"
-      namespace           = "AWS/ParallelCluster"
-      period              = "300"
-      statistic           = "Average"
-      threshold           = "100"
-      alarm_description   = "This metric monitors high queue depth"
+      alarm_name          = local.cloudwatch_config.alarms.high_queue_depth.alarm_name
+      comparison_operator = local.cloudwatch_config.alarms.high_queue_depth.comparison_operator
+      evaluation_periods  = local.cloudwatch_config.alarms.high_queue_depth.evaluation_periods
+      metric_name         = local.cloudwatch_config.alarms.high_queue_depth.metric_name
+      namespace           = local.cloudwatch_config.alarms.high_queue_depth.namespace
+      period              = local.cloudwatch_config.alarms.high_queue_depth.period
+      statistic           = local.cloudwatch_config.alarms.high_queue_depth.statistic
+      threshold           = local.cloudwatch_config.alarms.high_queue_depth.threshold
+      alarm_description   = local.cloudwatch_config.alarms.high_queue_depth.alarm_description
       alarm_actions       = [dependency.kms.outputs.sns_topic_arn]
       ok_actions          = [dependency.kms.outputs.sns_topic_arn]
-      treat_missing_data  = "notBreaching"
+      treat_missing_data  = local.cloudwatch_config.alarms.high_queue_depth.treat_missing_data
     }
   }
 
   # Tags
-  tags = {
+  tags = merge(local.common_tags, {
     Name = "hpc-${local.environment}-cloudwatch"
     Type = "CloudWatch"
     Purpose = "Monitoring"
-    Environment = local.environment
-    Region = local.region
-  }
+  })
 }

infrastructure/dev/us-east-2/networking/efa-sg/terragrunt.hcl

@@ -23,14 +23,14 @@ dependency "vpc" {
 inputs = {
   cluster_name = "hpc-${local.environment}"
   vpc_id       = dependency.vpc.outputs.vpc_id
-  vpc_cidr     = local.networking.vpc_cidr
+  vpc_cidr     = local.vpc_config.cidr_block
   subnet_id    = dependency.vpc.outputs.compute_subnets[0]
   availability_zone = local.networking.primary_az
 
   # EFA Configuration
-  efa_device = "efa0"
-  mtu_size   = 9000
-  enable_gpudirect = false  # Disabled for dev
+  efa_device = local.efa_config.device_name
+  mtu_size   = local.efa_config.mtu_size
+  enable_gpudirect = local.efa_config.enable_gpudirect
 
   # Instance Configuration
   instance_type = local.instance_types.compute
@@ -69,18 +69,13 @@ inputs = {
   ok_actions    = [aws_sns_topic.hpc_alerts.arn]
 
   # Tags
-  tags = {
+  tags = merge(local.common_tags, {
     Component = "EFA-Network"
     Tier      = "HPC-Compute"
-    Environment = local.environment
-    Region = local.region
-  }
+  })
 
   # Additional variables for local Terraform resources
   environment = local.environment
   region      = local.region
-  common_tags = {
-    Environment = local.environment
-    Region = local.region
-  }
+  common_tags = local.common_tags
 }

infrastructure/dev/us-east-2/networking/vpc/terragrunt.hcl

@@ -18,19 +18,19 @@ terraform {
 inputs = {
   # VPC Module inputs
   name = "hpc-${local.environment}-vpc"
-  cidr = local.networking.vpc_cidr
+  cidr = local.vpc_config.cidr_block
 
   azs             = local.availability_zones
-  private_subnets = local.networking.subnet_cidrs.private
-  public_subnets  = local.networking.subnet_cidrs.public
+  private_subnets = local.subnet_config.private.cidr_blocks
+  public_subnets  = local.subnet_config.public.cidr_blocks
 
   # Additional subnets for HPC
-  database_subnets = local.networking.subnet_cidrs.storage
-  compute_subnets  = local.networking.subnet_cidrs.compute
+  database_subnets = local.subnet_config.storage.cidr_blocks
+  compute_subnets  = local.subnet_config.compute.cidr_blocks
 
   # Enable DNS
-  enable_dns_hostnames = true
-  enable_dns_support   = true
+  enable_dns_hostnames = local.vpc_config.enable_dns_hostnames
+  enable_dns_support   = local.vpc_config.enable_dns_support
 
   # Enable NAT Gateway (single for dev)
   enable_nat_gateway = true
@@ -46,49 +46,36 @@ inputs = {
   enable_s3_endpoint = true
 
   # Tags
-  tags = {
+  tags = merge(local.common_tags, {
     Name = "hpc-${local.environment}-vpc"
     Type = "VPC"
-    Environment = local.environment
-    Region = local.region
-  }
+  })
 
   # Subnet tags
-  private_subnet_tags = {
+  private_subnet_tags = merge(local.common_tags, {
     Type = "Private-Subnet"
     Tier = "Compute"
-    Environment = local.environment
-    Region = local.region
-  }
+  })
 
-  public_subnet_tags = {
+  public_subnet_tags = merge(local.common_tags, {
     Type = "Public-Subnet"
     Tier = "Management"
-    Environment = local.environment
-    Region = local.region
-  }
+  })
 
-  database_subnet_tags = {
+  database_subnet_tags = merge(local.common_tags, {
     Type = "Database-Subnet"
     Tier = "Storage"
-    Environment = local.environment
-    Region = local.region
-  }
+  })
 
-  compute_subnet_tags = {
+  compute_subnet_tags = merge(local.common_tags, {
     Type = "Compute-Subnet"
     Tier = "HPC-Compute"
-    Environment = local.environment
-    Region = local.region
-  }
+  })
 
   # Additional variables for local Terraform resources
   environment = local.environment
   region      = local.region
-  vpc_cidr    = local.networking.vpc_cidr
-  common_tags = {
-    Environment = local.environment
-    Region = local.region
-  }
+  vpc_cidr    = local.vpc_config.cidr_block
+  common_tags = local.common_tags
 }