Fixed some spelling errors

Author: kcantrel

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

@@ -64,7 +64,7 @@ resource "aws_fsx_ontap_storage_virtual_machine" "mysvm" {
   name                = var.svm_name
 
 // OPTIONAL PARAMETERS
-  # root_volume_security_style = "
+  # root_volume_security_style = ""
   # tags                       = {}
   # active_directory_configuration {}
 }
@@ -88,7 +88,7 @@ resource "aws_fsx_ontap_volume" "myvol" {
   skip_final_backup = true
   # bypass_snaplock_enterprise_retention = true
   # copy_tags_to_backups = false
-  # security_style = "MIXED"
+  # security_style = "UNIX"
   # snaplock_configuration {}
   # snapshot_policy {}
   # tags = {}  

Terraform/deploy-fsx-ontap/standalone-module/security_groups.tf

@@ -22,7 +22,7 @@
 
 /* Set either the CIDR block OR the Security Group ID for the source of the ingress rules */
 locals {
-  ciddr_block = "10.0.0.0/8"   // Set this to the CIDR block you want to allow traffic from.
+  cidr_block = "10.0.0.0/8"    // Set this to the CIDR block you want to allow traffic from.
   security_group_id = ""       // Set this to the Security Group ID that is assigned to clients that you want to allow traffic from.
 }
 
@@ -44,7 +44,7 @@ resource "aws_vpc_security_group_ingress_rule" "all_icmp" {
 resource "aws_vpc_security_group_ingress_rule" "nfs_tcp" {
   security_group_id = aws_security_group.fsx_sg.id
   description       = "Remote procedure call for NFS"
-  cidr_ipv4         = (local.ciddr_block != "" ? local.ciddr_block : null)
+  cidr_ipv4         = (local.cidr_block != "" ? local.cidr_block : null)
   referenced_security_group_id = (local.security_group_id != "" ? local.security_group_id : null)
   from_port         = 111
   to_port           = 111
@@ -54,7 +54,7 @@ resource "aws_vpc_security_group_ingress_rule" "nfs_tcp" {
 resource "aws_vpc_security_group_ingress_rule" "nfs_udp" {
   security_group_id = aws_security_group.fsx_sg.id
   description       = "Remote procedure call for NFS"
-  cidr_ipv4         = (local.ciddr_block != "" ? local.ciddr_block : null)
+  cidr_ipv4         = (local.cidr_block != "" ? local.cidr_block : null)
   referenced_security_group_id = (local.security_group_id != "" ? local.security_group_id : null)
   from_port         = 111
   to_port           = 111
@@ -64,7 +64,7 @@ resource "aws_vpc_security_group_ingress_rule" "nfs_udp" {
 resource "aws_vpc_security_group_ingress_rule" "cifs" {
   security_group_id = aws_security_group.fsx_sg.id
   description       = "NetBIOS service session for CIFS"
-  cidr_ipv4         = (local.ciddr_block != "" ? local.ciddr_block : null)
+  cidr_ipv4         = (local.cidr_block != "" ? local.cidr_block : null)
   referenced_security_group_id = (local.security_group_id != "" ? local.security_group_id : null)
   from_port         = 139
   to_port           = 139
@@ -74,7 +74,7 @@ resource "aws_vpc_security_group_ingress_rule" "cifs" {
 resource "aws_vpc_security_group_ingress_rule" "snmp_tcp" {
   security_group_id = aws_security_group.fsx_sg.id
   description       = "Simple network management protocol for log collection"
-  cidr_ipv4         = (local.ciddr_block != "" ? local.ciddr_block : null)
+  cidr_ipv4         = (local.cidr_block != "" ? local.cidr_block : null)
   referenced_security_group_id = (local.security_group_id != "" ? local.security_group_id : null)
   from_port         = 161
   to_port           = 162
@@ -84,7 +84,7 @@ resource "aws_vpc_security_group_ingress_rule" "snmp_tcp" {
 resource "aws_vpc_security_group_ingress_rule" "snmp_udp" {
   security_group_id = aws_security_group.fsx_sg.id
   description       = "Simple network management protocol for log collection"
-  cidr_ipv4         = (local.ciddr_block != "" ? local.ciddr_block : null)
+  cidr_ipv4         = (local.cidr_block != "" ? local.cidr_block : null)
   referenced_security_group_id = (local.security_group_id != "" ? local.security_group_id : null)
   from_port         = 161
   to_port           = 162
@@ -94,7 +94,7 @@ resource "aws_vpc_security_group_ingress_rule" "snmp_udp" {
 resource "aws_vpc_security_group_ingress_rule" "smb_cifs" {
   security_group_id = aws_security_group.fsx_sg.id
   description       = "Microsoft SMB/CIFS over TCP with NetBIOS framing"
-  cidr_ipv4         = (local.ciddr_block != "" ? local.ciddr_block : null)
+  cidr_ipv4         = (local.cidr_block != "" ? local.cidr_block : null)
   referenced_security_group_id = (local.security_group_id != "" ? local.security_group_id : null)
   from_port         = 445
   to_port           = 445
@@ -104,7 +104,7 @@ resource "aws_vpc_security_group_ingress_rule" "smb_cifs" {
 resource "aws_vpc_security_group_ingress_rule" "nfs_mount_tcp" {
   security_group_id = aws_security_group.fsx_sg.id
   description       = "NFS mount"
-  cidr_ipv4         = (local.ciddr_block != "" ? local.ciddr_block : null)
+  cidr_ipv4         = (local.cidr_block != "" ? local.cidr_block : null)
   referenced_security_group_id = (local.security_group_id != "" ? local.security_group_id : null)
   from_port         = 635
   to_port           = 635
@@ -114,7 +114,7 @@ resource "aws_vpc_security_group_ingress_rule" "nfs_mount_tcp" {
 resource "aws_vpc_security_group_ingress_rule" "kerberos" {
   security_group_id = aws_security_group.fsx_sg.id
   description       = "Kerberos authentication"
-  cidr_ipv4         = (local.ciddr_block != "" ? local.ciddr_block : null)
+  cidr_ipv4         = (local.cidr_block != "" ? local.cidr_block : null)
   referenced_security_group_id = (local.security_group_id != "" ? local.security_group_id : null)
   from_port         = 749
   to_port           = 749
@@ -124,7 +124,7 @@ resource "aws_vpc_security_group_ingress_rule" "kerberos" {
 resource "aws_vpc_security_group_ingress_rule" "nfs_server_daemon" {
   security_group_id = aws_security_group.fsx_sg.id
   description       = "NFS server daemon"
-  cidr_ipv4         = (local.ciddr_block != "" ? local.ciddr_block : null)
+  cidr_ipv4         = (local.cidr_block != "" ? local.cidr_block : null)
   referenced_security_group_id = (local.security_group_id != "" ? local.security_group_id : null)
   from_port         = 2049
   to_port           = 2049
@@ -134,7 +134,7 @@ resource "aws_vpc_security_group_ingress_rule" "nfs_server_daemon" {
 resource "aws_vpc_security_group_ingress_rule" "nfs_server_daemon_udp" {
   security_group_id = aws_security_group.fsx_sg.id
   description       = "NFS server daemon"
-  cidr_ipv4         = (local.ciddr_block != "" ? local.ciddr_block : null)
+  cidr_ipv4         = (local.cidr_block != "" ? local.cidr_block : null)
   referenced_security_group_id = (local.security_group_id != "" ? local.security_group_id : null)
   from_port         = 2049
   to_port           = 2049
@@ -144,7 +144,7 @@ resource "aws_vpc_security_group_ingress_rule" "nfs_server_daemon_udp" {
 resource "aws_vpc_security_group_ingress_rule" "nfs_lock_daemon" {
   security_group_id = aws_security_group.fsx_sg.id
   description       = "NFS lock daemon"
-  cidr_ipv4         = (local.ciddr_block != "" ? local.ciddr_block : null)
+  cidr_ipv4         = (local.cidr_block != "" ? local.cidr_block : null)
   referenced_security_group_id = (local.security_group_id != "" ? local.security_group_id : null)
   from_port         = 4045
   to_port           = 4045
@@ -154,7 +154,7 @@ resource "aws_vpc_security_group_ingress_rule" "nfs_lock_daemon" {
 resource "aws_vpc_security_group_ingress_rule" "nfs_lock_daemon_udp" {
   security_group_id = aws_security_group.fsx_sg.id
   description       = "NFS lock daemon"
-  cidr_ipv4         = (local.ciddr_block != "" ? local.ciddr_block : null)
+  cidr_ipv4         = (local.cidr_block != "" ? local.cidr_block : null)
   referenced_security_group_id = (local.security_group_id != "" ? local.security_group_id : null)
   from_port         = 4045
   to_port           = 4045
@@ -164,7 +164,7 @@ resource "aws_vpc_security_group_ingress_rule" "nfs_lock_daemon_udp" {
 resource "aws_vpc_security_group_ingress_rule" "nfs_status_monitor" {
   security_group_id = aws_security_group.fsx_sg.id
   description       = "Status monitor for NFS"
-  cidr_ipv4         = (local.ciddr_block != "" ? local.ciddr_block : null)
+  cidr_ipv4         = (local.cidr_block != "" ? local.cidr_block : null)
   referenced_security_group_id = (local.security_group_id != "" ? local.security_group_id : null)
   from_port         = 4046
   to_port           = 4046
@@ -174,7 +174,7 @@ resource "aws_vpc_security_group_ingress_rule" "nfs_status_monitor" {
 resource "aws_vpc_security_group_ingress_rule" "nfs_status_monitor_udp" {
   security_group_id = aws_security_group.fsx_sg.id
   description       = "Status monitor for NFS"
-  cidr_ipv4         = (local.ciddr_block != "" ? local.ciddr_block : null)
+  cidr_ipv4         = (local.cidr_block != "" ? local.cidr_block : null)
   referenced_security_group_id = (local.security_group_id != "" ? local.security_group_id : null)
   from_port         = 4046
   to_port           = 4046
@@ -184,7 +184,7 @@ resource "aws_vpc_security_group_ingress_rule" "nfs_status_monitor_udp" {
 resource "aws_vpc_security_group_ingress_rule" "nfs_rquotad" {
   security_group_id = aws_security_group.fsx_sg.id
   description       = "Remote quota server for NFS"
-  cidr_ipv4         = (local.ciddr_block != "" ? local.ciddr_block : null)
+  cidr_ipv4         = (local.cidr_block != "" ? local.cidr_block : null)
   referenced_security_group_id = (local.security_group_id != "" ? local.security_group_id : null)
   from_port         = 4049
   to_port           = 4049
@@ -194,7 +194,7 @@ resource "aws_vpc_security_group_ingress_rule" "nfs_rquotad" {
 resource "aws_vpc_security_group_ingress_rule" "iscsi_tcp" {
   security_group_id = aws_security_group.fsx_sg.id
   description       = "iSCSI"
-  cidr_ipv4         = (local.ciddr_block != "" ? local.ciddr_block : null)
+  cidr_ipv4         = (local.cidr_block != "" ? local.cidr_block : null)
   referenced_security_group_id = (local.security_group_id != "" ? local.security_group_id : null)
   from_port         = 3260
   to_port           = 3260
@@ -204,7 +204,7 @@ resource "aws_vpc_security_group_ingress_rule" "iscsi_tcp" {
 resource "aws_vpc_security_group_ingress_rule" "Snapmirror_Intercluster_communication" {
   security_group_id = aws_security_group.fsx_sg.id
   description       = "Snapmirror Intercluster communication"
-  cidr_ipv4         = (local.ciddr_block != "" ? local.ciddr_block : null)
+  cidr_ipv4         = (local.cidr_block != "" ? local.cidr_block : null)
   referenced_security_group_id = (local.security_group_id != "" ? local.security_group_id : null)
   from_port         = 11104
   to_port           = 11104
@@ -214,7 +214,7 @@ resource "aws_vpc_security_group_ingress_rule" "Snapmirror_Intercluster_communic
 resource "aws_vpc_security_group_ingress_rule" "Snapmirror_data_transfer" {
   security_group_id = aws_security_group.fsx_sg.id
   description       = "Snapmirror data transfer"
-  cidr_ipv4         = (local.ciddr_block != "" ? local.ciddr_block : null)
+  cidr_ipv4         = (local.cidr_block != "" ? local.cidr_block : null)
   referenced_security_group_id = (local.security_group_id != "" ? local.security_group_id : null)
   from_port         = 11105
   to_port           = 11105
@@ -224,7 +224,7 @@ resource "aws_vpc_security_group_ingress_rule" "Snapmirror_data_transfer" {
 resource "aws_vpc_security_group_ingress_rule" "nfs_mount_udp" {
   security_group_id = aws_security_group.fsx_sg.id
   description       = "NFS mount"
-  cidr_ipv4         = (local.ciddr_block != "" ? local.ciddr_block : null)
+  cidr_ipv4         = (local.cidr_block != "" ? local.cidr_block : null)
   referenced_security_group_id = (local.security_group_id != "" ? local.security_group_id : null)
   from_port         = 635
   to_port           = 635
@@ -234,7 +234,7 @@ resource "aws_vpc_security_group_ingress_rule" "nfs_mount_udp" {
 resource "aws_vpc_security_group_ingress_rule" "ssh" {
   security_group_id = aws_security_group.fsx_sg.id
   description       = "ssh"
-  cidr_ipv4         = (local.ciddr_block != "" ? local.ciddr_block : null)
+  cidr_ipv4         = (local.cidr_block != "" ? local.cidr_block : null)
   referenced_security_group_id = (local.security_group_id != "" ? local.security_group_id : null)
   from_port         = 22
   to_port           = 22
@@ -244,7 +244,7 @@ resource "aws_vpc_security_group_ingress_rule" "ssh" {
 resource "aws_vpc_security_group_ingress_rule" "s3_and_api" {
   security_group_id = aws_security_group.fsx_sg.id
   description       = "Provice acccess to S3 and the ONTAP REST API"
-  cidr_ipv4         = (local.ciddr_block != "" ? local.ciddr_block : null)
+  cidr_ipv4         = (local.cidr_block != "" ? local.cidr_block : null)
   referenced_security_group_id = (local.security_group_id != "" ? local.security_group_id : null)
   from_port         = 443
   to_port           = 443

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

@@ -4,12 +4,6 @@ variable "aws_secretsmanager_region" {
    default     = "us-east-2"
 }
 
-variable "fsx_secret_name" {
-   description = "The name of the AWS SecretManager secret that holds the ONTAP administrative password for the fsxadmin user that you can use to administer your file system using the ONTAP CLI and REST API."
-   type        = string
-   default     = "fsx_secret"
-}
-
 variable "fsx_capacity_size_gb" {
    description = "The storage capacity (GiB) of the FSxN file system. Valid values between 1024 and 196608."
    type        = number
@@ -42,6 +36,12 @@ variable "fsx_region" {
    default     = "us-west-2"
 }
 
+variable "fsx_secret_name" {
+   description = "The name of the AWS SecretManager secret that holds the ONTAP administrative password for the fsxadmin user that you can use to administer your file system using the ONTAP CLI and REST API."
+   type        = string
+   default     = "fsx_secret"
+}
+
 variable "fsx_subnets" {
    description = "A list of subnets IDs that the file system will be accessible from. For MULTI_AZ_1 deployment type, provide both subnets. For SINGLE_AZ_1 deployment type, only the primary subnet is used."
    type        = map(any)