Merge pull request #69 from NetApp/kerensMac

set iops configuration to null (default)
NetApp · Jan 29, 2024 · 98db559 · 98db559
2 parents 0960a11 + 5eb44da
commit 98db559
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/Terraform/deploy-fsx-ontap/README.md b/Terraform/deploy-fsx-ontap/README.md
@@ -196,7 +196,7 @@ terraform apply -y
 | cidr_for_sg | cide block to be used for the ingress rules | `string` | `"0.0.0.0/0"` | no |
 | create_sg | Determines whether the SG should be deployed as part of this execution or not | `bool` | `false` | no |
 | daily_backup_start_time | A recurring daily time, in the format HH:MM. HH is the zero-padded hour of the day (0-23), and MM is the zero-padded minute of the hour. Requires automatic_backup_retention_days to be set. | `string` | `"00:00"` | no |
-| disk_iops_configuration | The SSD IOPS configuration for the Amazon FSx for NetApp ONTAP file system | `map(any)` | <pre>{<br>  "iops": 3000,<br>  "mode": "AUTOMATIC"<br>}</pre> | no |
+| disk_iops_configuration | The SSD IOPS configuration for the Amazon FSx for NetApp ONTAP file system | `map(any)` | `null` | no |
 | fsx_capacity_size_gb | The storage capacity (GiB) of the FSxN file system. Valid values between 1024 and 196608 | `number` | `1024` | no |
 | fsx_deploy_type | The filesystem deployment type. Supports MULTI_AZ_1 and SINGLE_AZ_1 | `string` | `"SINGLE_AZ_1"` | no |
 | fsx_maintenance_start_time | The preferred start time (in d:HH:MM format) to perform weekly maintenance, in the UTC time zone. | `string` | `"1:00:00"` | no |

diff --git a/Terraform/deploy-fsx-ontap/main.tf b/Terraform/deploy-fsx-ontap/main.tf
@@ -146,10 +146,7 @@ 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 {
-    iops = var.disk_iops_configuration["iops"]
-    mode = var.disk_iops_configuration["mode"]
-  }
+  disk_iops_configuration           = var.disk_iops_configuration
   fsx_admin_password = var.fsx_admin_password
   route_table_ids    = var.route_table_ids
   tags               = var.tags

diff --git a/Terraform/deploy-fsx-ontap/variables.tf b/Terraform/deploy-fsx-ontap/variables.tf
@@ -58,7 +58,7 @@ variable "fsx_maintenance_start_time" {
 variable "kms_key_id" {
   description = "ARN for the KMS Key to encrypt the file system at rest, Defaults to an AWS managed KMS Key."
   type        = string
-  default = null
+  default     = null
 }
 
 variable "backup_retention_days" {
@@ -76,10 +76,7 @@ variable "daily_backup_start_time" {
 variable "disk_iops_configuration" {
   description = "The SSD IOPS configuration for the Amazon FSx for NetApp ONTAP file system"
   type        = map(any)
-  default = {
-     "iops" = 3000
-     "mode" = "AUTOMATIC"
-  }
+  default     = null
 }
 
 variable "fsx_admin_password" {