Fix FSx Lustre module configuration and storage capacity

Author: catherinevee

infrastructure/dev/us-east-2/storage/fsx-lustre-persistent/terragrunt.hcl

@@ -21,7 +21,7 @@ inputs = {
   name = "hpc-dev-persistent"
 
   # Storage Configuration - Hardcoded for dev environment
-  storage_capacity = 10  # 10TB for dev
+  storage_capacity = 10240  # 10TB = 10240 GiB for dev
   storage_type     = "SSD"
   deployment_type  = "PERSISTENT_1"
   per_unit_storage_throughput = 1000  # MB/s per TiB
@@ -44,13 +44,17 @@ inputs = {
   # S3 Data Repository
   data_repository_path = "s3://hpc-dev-us-east-2-data-repository/persistent"  # Will be replaced when S3 is applied
 
-  # Tags - Hardcoded for dev environment
-  tags = {
+  # Common tags
+  common_tags = {
     Environment = "dev"
     Region = "us-east-2"
     Project = "HPC-Networking"
     ManagedBy = "Terragrunt"
     Owner = "DevOps-Team"
+  }
+  
+  # Tags - Hardcoded for dev environment
+  tags = {
     Purpose = "Persistent-Storage"
     DataLifecycle = "Long-term"
     Name = "hpc-dev-persistent"

infrastructure/dev/us-east-2/storage/fsx-lustre-scratch/terragrunt.hcl

@@ -21,7 +21,7 @@ inputs = {
   name = "hpc-dev-scratch"
 
   # Storage Configuration - Hardcoded for dev environment
-  storage_capacity = 50  # 50TB for dev
+  storage_capacity = 51200  # 50TB = 51200 GiB for dev
   storage_type     = "SSD"
   deployment_type  = "PERSISTENT_1"
   per_unit_storage_throughput = 200  # MB/s per TiB
@@ -44,13 +44,17 @@ inputs = {
   # S3 Data Repository
   data_repository_path = "s3://hpc-dev-us-east-2-data-repository/scratch"  # Will be replaced when S3 is applied
 
-  # Tags - Hardcoded for dev environment
-  tags = {
+  # Common tags
+  common_tags = {
     Environment = "dev"
     Region = "us-east-2"
     Project = "HPC-Networking"
     ManagedBy = "Terragrunt"
     Owner = "DevOps-Team"
+  }
+  
+  # Tags - Hardcoded for dev environment
+  tags = {
     Purpose = "Scratch-Storage"
     DataLifecycle = "Temporary"
     Name = "hpc-dev-scratch"

infrastructure/modules/fsx-lustre/main.tf

@@ -29,29 +29,20 @@ resource "aws_fsx_lustre_file_system" "main" {
   subnet_ids         = var.subnet_ids
   security_group_ids = var.security_group_ids
 
-  # Data repository association
-  dynamic "data_repository_association" {
-    for_each = var.data_repository_path != null ? [1] : []
-    content {
-      data_repository_path = var.data_repository_path
-      file_system_path     = var.file_system_path
-    }
-  }
-
-  tags = merge(var.tags, {
+  tags = merge(var.common_tags, var.tags, {
     Name = var.name
   })
 }
 
-# Mount target for the file system
-resource "aws_fsx_lustre_file_system" "mount_target" {
-  count = var.create_mount_target ? 1 : 0
+# Data repository association
+resource "aws_fsx_data_repository_association" "main" {
+  count = var.data_repository_path != null ? 1 : 0
 
-  file_system_id = aws_fsx_lustre_file_system.main.id
-  subnet_id      = var.subnet_ids[0]
-  security_groups = var.security_group_ids
+  file_system_id       = aws_fsx_lustre_file_system.main.id
+  data_repository_path = var.data_repository_path
+  file_system_path     = var.file_system_path
 
-  tags = merge(var.tags, {
-    Name = "${var.name}-mount-target"
+  tags = merge(var.common_tags, var.tags, {
+    Name = "${var.name}-data-repo"
   })
 }

infrastructure/modules/fsx-lustre/variables.tf

@@ -103,6 +103,12 @@ variable "create_mount_target" {
   default     = false
 }
 
+variable "common_tags" {
+  description = "A map of common tags to assign to the file system"
+  type        = map(string)
+  default     = {}
+}
+
 variable "tags" {
   description = "A map of tags to assign to the file system"
   type        = map(string)