Merge pull request #146 from NetApp/update_terraform_fsxn

Getting disk disk_iops_configuration to work.

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 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 |
+| disk_iops_configuration | The SSD IOPS configuration for the file system. Valid modes are 'AUTOMATIC' (3 iops per GB provided) or 'USER_PROVISIONED'. If you choose USER_PROVISIONED, you must also provide the 'iops' variable set to the desired number of iops. | `map(any)` | <pre>{<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 |
@@ -270,7 +270,7 @@ terraform apply -y
 | fsx_tput_in_MBps | The throughput capacity (in MBps) for the file system. Valid values are 128, 256, 512, 1024, 2048, and 4096. | `number` | `128` | no |
 | kms_key_id | ARN for the KMS Key to encrypt the file system at rest, Defaults to an AWS managed KMS Key. | `string` | `null` | no |
 | root_vol_sec_style | Specifies the root volume security style, Valid values are UNIX, NTFS, and MIXED (although MIXED is not recommended). All volumes created under this SVM will inherit the root security style unless the security style is specified on the volume. | `string` | `"UNIX"` | no |
-| route_table_ids | Specifies the VPC route tables in which your file system's endpoints will be created. You should specify all VPC route tables associated with the subnets in which your clients are located. By default, Amazon FSx selects your VPC's default route table. | `list(any)` | `null` | no |
+| route_table_ids | Specifies the VPC route tables in which your file system's endpoints will be created. You should specify all VPC route tables associated with the subnets in which your clients are located. By default, Amazon FSx selects your VPC's default route table. Note, this variable is only used for MULTI_AZ_1 type deployments. | `list(any)` | `null` | no |
 | security_group_id | If you are not creating the SG, provide the ID of the SG to be used | `string` | `""` | no |
 | source_security_group_id | The ID of the security group to allow access to the FSxN file system. | `string` | `""` | no |
 | svm_name | The name of the Storage Virtual Machine | `string` | `"first_svm"` | no |

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

@@ -114,11 +114,10 @@ variable "daily_backup_start_time" {
 }
 
 variable "disk_iops_configuration" {
-  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."
+  description = "The SSD IOPS configuration for the file system. Valid modes are 'AUTOMATIC' (3 iops per GB provided) or 'USER_PROVISIONED'. If you choose USER_PROVISIONED, you must also provide the 'iops' variable set to the desired number of iops."
   type        = map(any)
   default     = {
     mode = "AUTOMATIC"
-    iops = null
   }
 }
 
@@ -133,7 +132,7 @@ variable "fsx_secret_name" {
 }
 
 variable "route_table_ids" {
-  description = "Specifies the VPC route tables in which your file system's endpoints will be created. You should specify all VPC route tables associated with the subnets in which your clients are located. By default, Amazon FSx selects your VPC's default route table."
+  description = "Specifies the VPC route tables in which your file system's endpoints will be created. You should specify all VPC route tables associated with the subnets in which your clients are located. By default, Amazon FSx selects your VPC's default route table. Note, this variable is only used for MULTI_AZ_1 type deployments."
   type        = list(any)
   default     = null
 }