Merge pull request #64 from NetApp/kerensMac

Kerens mac

Terraform/deploy-fsx-ontap/README.md

@@ -123,18 +123,18 @@ module "fsxontap" {
         "primarysub" = "<YOUR-PRIMARY-SUBNET>"
         "secondarysub" = "<YOUR-SECONDAY-SUBNET>"
     }
-    create_sg = true
+    create_sg = <true / false> // true to create Security Group for the Fs / false otherwise
     cidr_for_sg = "<YOUR-CIDR-BLOCK>"
     fsx_admin_password = "<YOUR_PASSWORD>"
-    route_table_ids = ["ID-1", "ID-2"]
+    route_table_ids = [<"ID-1", "ID-2", ...>]
     tags = {
         Terraform   = "true"
         Environment = "dev"
     }
 }
 ```
-   > [NOTE!]
-   > To Override default values assigned to other variables in this module, add them to this source block as well. The above source block includes the minimum requirements only.
+  > [NOTE!]
+  > To Override default values assigned to other variables in this module, add them to this source block as well. The above source block includes the minimum requirements only.
 
 Please read the vriables descruptions in `variables.tf` file for more information regarding the variables passed to the module block.
 
@@ -196,7 +196,6 @@ terraform apply -y
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | fsx_admin_password | The ONTAP administrative password for the fsxadmin user that you can use to administer your file system using the ONTAP CLI and REST API | `string` | n/a | yes |
-| kms_key_id | ARN for the KMS Key to encrypt the file system at rest, Defaults to an AWS managed KMS Key. | `string` | n/a | yes |
 | 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. | `list(any)` | n/a | yes |
 | backup_retention_days | The number of days to retain automatic backups. Setting this to 0 disables automatic backups. You can retain automatic backups for a maximum of 90 days. | `number` | `0` | no |
 | cidr_for_sg | cide block to be used for the ingress rules | `string` | `"0.0.0.0/0"` | no |
@@ -209,6 +208,7 @@ terraform apply -y
 | fsx_name | The deployed filesystem name | `string` | `"terraform-fsxn"` | no |
 | fsx_subnets | The IDs of the subnets fro which the FSxN filesystem will be assigned IP addresses | `map(any)` | <pre>{<br>  "primarysub": "",<br>  "secondarysub": ""<br>}</pre> | no |
 | fsx_tput_in_MBps | The throughput capacity (in MBps) for the file system. Valid values are 128, 256, 512, 1024, 2048, and 4096. | `number` | `256` | 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. All volumes created under this SVM will inherit the root security style unless the security style is specified on the volume. | `string` | `"UNIX"` | no |
 | storage_type | The filesystem storage type | `string` | `"SSD"` | no |
 | svm_name | The name of the Storage Virtual Machine | `string` | `"first_svm"` | no |

Terraform/deploy-fsx-ontap/variables.tf

@@ -58,6 +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
 }
 
 variable "backup_retention_days" {