One fsx will do

Author: heerener

hpc_provisioner/src/hpc_provisioner/config-dev/compute_cluster.tpl.yaml

@@ -28,5 +28,4 @@ SharedStorage:
     MountDir: /sbo/home
     EfsSettings:
       FileSystemId: !config efs_id
-  - !config projects_fsx
-  - !config scratch_fsx
+  - !config fsx

hpc_provisioner/src/hpc_provisioner/config/compute_cluster.tpl.yaml

@@ -28,5 +28,4 @@ SharedStorage:
     MountDir: /sbo/home
     EfsSettings:
       FileSystemId: !config efs_id
-  - !config projects_fsx
-  - !config scratch_fsx
+  - !config fsx

hpc_provisioner/src/hpc_provisioner/pcluster_manager.py

@@ -244,14 +244,14 @@ def pcluster_create(cluster: Cluster, filesystems: list):
             )
             if not fs:
                 raise RuntimeError(f"Filesystem {filesystem} not created when it should have been")
-            CONFIG_VALUES[f"{filesystem['name']}_fsx"] = {
+            CONFIG_VALUES["fsx"] = {
                 "Name": filesystem["name"],
                 "StorageType": "FsxLustre",
                 "MountDir": filesystem["mountpoint"],
                 "FsxLustreSettings": {"FileSystemId": fs["FileSystemId"]},
             }
         else:
-            CONFIG_VALUES[f"{filesystem['name']}_fsx"] = {}
+            CONFIG_VALUES["fsx"] = {}
 
     pcluster_config = load_pcluster_config(cluster.dev)
     if not cluster.include_lustre: