Merge pull request #145 from NetApp/update_terraform_fsxn

Worked around a problem with the AWS provider where iops have to be s…

Author: kcantrel

Terraform/deploy-fsx-ontap/module/README.md

@@ -261,7 +261,7 @@ terraform apply -y
 | cidr_for_sg | cidr block to be used for the created security ingress rules. | `string` | `"10.0.0.0/8"` | no |
 | create_sg | Determines whether the SG should be deployed as part of this execution or not | `bool` | `true` | 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>  "mode": "AUTOMATIC"<br>}</pre> | no |
+| disk_iops_configuration | The SSD IOPS configuration for the file system. Valid modes are 'AUTOMATIC' (3 iops per GB provided) or 'USER_PROVISIONED' with a maxmimum of 160,000 iops. Note, both 'mode' and 'iops' are required, so if setting to AUTOMATIC, set iops to null. | `map(any)` | <pre>{<br>  "iops": null,<br>  "mode": "AUTOMATIC"<br>}</pre> | 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` | `"MULTI_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 |

Terraform/deploy-fsx-ontap/module/main.tf

@@ -32,7 +32,7 @@ resource "aws_fsx_ontap_file_system" "terraform-fsxn" {
   dynamic "disk_iops_configuration" {
     for_each = var.disk_iops_configuration != null ? [var.disk_iops_configuration] : []
     content {
-      iops = (disk_iops_configuration.value["iops"] != null ? disk_iops_configuration.value["iops"] : 0)
+      iops = disk_iops_configuration.value["iops"]
       mode = disk_iops_configuration.value["mode"]
     }
   }

Terraform/deploy-fsx-ontap/module/variables.tf

@@ -114,10 +114,11 @@ variable "daily_backup_start_time" {
 }
 
 variable "disk_iops_configuration" {
-  description = "The SSD IOPS configuration for the Amazon FSx for NetApp ONTAP file system"
+  description = "The SSD IOPS configuration for the file system. Valid modes are 'AUTOMATIC' (3 iops per GB provided) or 'USER_PROVISIONED' with a maxmimum of 160,000 iops. Note, both 'mode' and 'iops' are required, so if setting to AUTOMATIC, set iops to null."
   type        = map(any)
   default     = {
     mode = "AUTOMATIC"
+    iops = null
   }
 }