Merge pull request #70 from NetApp/kerensMac

Kerens mac
NetApp · Jan 30, 2024 · a2f93c4 · a2f93c4
2 parents 98db559 + 17b3f46
commit a2f93c4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/Terraform/deploy-fsx-ontap/README.md b/Terraform/deploy-fsx-ontap/README.md
@@ -210,7 +210,7 @@ terraform apply -y
 | svm_name | The name of the Storage Virtual Machine | `string` | `"first_svm"` | no |
 | tags | Tags to be applied to the resources | `map(any)` | <pre>{<br>  "Name": "terraform-fsxn"<br>}</pre> | no |
 | vol_info | Details for the volume creation | `map(any)` | <pre>{<br>  "bypass_sl_retention": false,<br>  "cooling_period": 31,<br>  "copy_tags_to_backups": false,<br>  "efficiency": true,<br>  "junction_path": "/vol1",<br>  "sec_style": "UNIX",<br>  "size_mg": 1024,<br>  "skip_final_backup": false,<br>  "tier_policy_name": "AUTO",<br>  "vol_name": "vol1",<br>  "vol_type": "RW"<br>}</pre> | no |
-| vol_snapshot_policy | Specifies the snapshot policy for the volume | `map(any)` | <pre>{<br>  "Name": "terraform-fsxn"<br>}</pre> | no |
+| vol_snapshot_policy | Specifies the snapshot policy for the volume | `map(any)` | `null` | no |
 | vpc_id | The ID of the VPC in which the FSxN fikesystem should be deployed | `string` | `"vpc-111111111"` | no |
 
 ### Outputs

diff --git a/Terraform/deploy-fsx-ontap/main.tf b/Terraform/deploy-fsx-ontap/main.tf
@@ -146,10 +146,16 @@ resource "aws_fsx_ontap_file_system" "terraform-fsxn" {
   automatic_backup_retention_days   = var.backup_retention_days
   daily_automatic_backup_start_time = var.daily_backup_start_time
   storage_type                      = var.storage_type
-  disk_iops_configuration           = var.disk_iops_configuration
   fsx_admin_password = var.fsx_admin_password
   route_table_ids    = var.route_table_ids
   tags               = var.tags
+  dynamic "disk_iops_configuration" {
+    for_each = var.disk_iops_configuration != null ? [var.disk_iops_configuration] : []
+    content {
+      iops = disk_iops_configuration.value["iops"]
+      mode = disk_iops_configuration.value["mode"]
+    }
+  }
   # endpoint_ip_address_range = ""
 }
 
@@ -183,6 +189,6 @@ resource "aws_fsx_ontap_volume" "myvol" {
   security_style                       = var.vol_info["sec_style"]
   skip_final_backup                    = var.vol_info["skip_final_backup"]
   # snaplock_configuration {}
-  snapshot_policy = "NONE"
+  # snapshot_policy {}
   tags            = var.tags
 }
diff --git a/Terraform/deploy-fsx-ontap/variables.tf b/Terraform/deploy-fsx-ontap/variables.tf
@@ -129,9 +129,7 @@ variable "vol_info" {
 variable "vol_snapshot_policy" {
   description = "Specifies the snapshot policy for the volume"
   type        = map(any)
-  default = {
-     "Name" = "terraform-fsxn"
-  }
+  default = null
 }
 
 variable "tags" {