Modify FSx Docs

* `fsx_kms_key_id` is used only for windows based file systems.
  * https://docs.aws.amazon.com/fsx/latest/APIReference/API_FileSystem.html
* `imported_file_chunk_size` or `export_path` are only valid when using `import_path`.

Signed-off-by: Sean Smith <[email protected]>

Author: Sean Smith

docs/configuration.rst

@@ -1000,10 +1000,9 @@ Or create and configure a new file system, with the following parameters ::
     [fsx fs]
     shared_dir = /fsx
     storage_capacity = 3600
-    fsx_kms_key_id = 9e8a129c-0e85-459-865b-3a5be974a22b
+    import_path = s3://bucket
     imported_file_chunk_size = 1024
     export_path = s3://bucket/folder
-    import_path = s3://bucket
     weekly_maintenance_start_time = 1:00:00
 
 shared_dir
@@ -1034,16 +1033,16 @@ Defaults to 3,600 GiB. ::
 
     storage_capacity = 3600
 
-fsx_kms_key_id
-""""""""""""""
-**Optional** The ID of your AWS Key Management Service (AWS KMS) key.
+import_path
+"""""""""""
+**Optional** S3 Bucket to load data from into the file system. Also serves as the export bucket. See ``export_path``.
 
-This ID is used to encrypt the data in your file system at rest.
+Import occurs on cluster creation, see `Importing Data from your Amazon S3 Bucket
+<https://docs.aws.amazon.com/fsx/latest/LustreGuide/fsx-data-repositories.html#import-data-repository>`_
 
-This must be used with a custom ``ec2_iam_role``. See
-:ref:`Disk Encryption with a Custom KMS Key <tutorials_encrypted_kms_fs>`. ::
+If not provided, file system will be empty. ::
 
-    fsx_kms_key_id = xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+    import_path =  s3://bucket
 
 imported_file_chunk_size
 """"""""""""""""""""""""
@@ -1052,31 +1051,23 @@ and maximum amount of data per file (in MiB) stored on a single physical disk. T
 file can be striped across is limited by the total number of disks that make up the file system.
 
 The chunk size default is 1,024 MiB (1 GiB) and can go as high as 512,000 MiB (500 GiB).
-Amazon S3 objects have a maximum size of 5 TB. ::
+Amazon S3 objects have a maximum size of 5 TB.
+
+Valid only when using ``import_path``. ::
 
     imported_file_chunk_size = 1024
 
 export_path
 """""""""""
-
 **Optional** The S3 path where the root of your file system is exported. The path **must** be in the same S3 bucket as
 the ``import_path`` parameter.
 
 Defaults to ``s3://import-bucket/FSxLustre[creation-timestamp]`` where ``import-bucket`` is the bucket provided in
-``import_path`` parameter. ::
+``import_path`` parameter.
 
-    export_path = s3://bucket/folder
-
-import_path
-"""""""""""
-***Optional** S3 Bucket to load data from into the file system. Also serves as the export bucket. See ``export_path``.
+Valid only when using ``import_path``. ::
 
-Import occurs on cluster creation, see `Importing Data from your Amazon S3 Bucket
-<https://docs.aws.amazon.com/fsx/latest/LustreGuide/fsx-data-repositories.html#import-data-repository>`_
-
-If not provided, file system will be empty. ::
-
-    import_path =  s3://bucket
+    export_path = s3://bucket/folder
 
 weekly_maintenance_start_time
 """""""""""""""""""""""""""""

docs/tutorials/04_encrypted_kms_fs.rst

@@ -7,8 +7,8 @@
 Disk Encryption with a Custom KMS Key
 #####################################
 
-AWS ParallelCluster supports the configuration options ``ebs_kms_key_id`` and ``fsx_kms_key_id``, which allow you to
-provide a custom KMS key for EBS Disk encryption or FSx Lustre. To use them you'll need to specify a ``ec2_iam_role``.
+AWS ParallelCluster supports the configuration options ``ebs_kms_key_id``, which allows you to
+provide a custom KMS key for EBS Disk encryption. To use it you'll need to specify a ``ec2_iam_role``.
 
 In order for the cluster to create, the KMS key needs to know the name of the cluster's role. This prevents you from
 using the role created on cluster create, requiring a custom ``ec2_iam_role``.
@@ -57,20 +57,15 @@ Now create a cluster, here's an example of a cluster with encrypted ``Raid 0`` d
    encrypted = true
    ebs_kms_key_id = xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
 
-Here's an example with FSx Lustre file system: ::
+Here's an example with EBS: ::
 
    [cluster default]
    ...
-   fsx_settings = fs
+   ebs_settings = custom1
    ec2_iam_role = ParallelClusterInstanceRole
 
-   [fsx fs]
-   shared_dir = /fsx
-   storage_capacity = 3600
-   imported_file_chunk_size = 1024
-   export_path = s3://bucket/folder
-   import_path = s3://bucket
-   weekly_maintenance_start_time = 1:00:00
-   fsx_kms_key_id = xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-
-Similar configuration applies for EBS and FSx based file systems.
+   [ebs custom1]
+   shared_dir = vol1
+   ebs_kms_key_id = xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+   volume_type = io1
+   volume_iops = 200