add admin home for unifying behavior with GPU clus

Author: rvencu

Templates/AWS-HPC-Cluster.yaml

@@ -15,6 +15,7 @@ Metadata:
           - PrivateSubnetAId
           - ODCRGroupName
           - FSx
+          - AdminFSx
           - AD
           - ADDNS0
           - ADDNS1
@@ -38,6 +39,8 @@ Metadata:
         default: 'ODCR Group Name:'
       FSx: 
         default: 'FSx:'
+      AdminFSx:
+        default: 'Admin FSx:'
       AD: 
         default: 'Active Directory:'
       ADDNS0:
@@ -101,6 +104,12 @@ Parameters:
       AllowedPattern: ^(AUTO|fs-[0-9a-z]+)$
       Default : AUTO
 
+    AdminFSx:
+      Description: 'Please, enter your Admin FSx ID, or just leave "AUTO" if you want to re-use an existing one.'
+      Type: String
+      AllowedPattern: ^(AUTO|fs-[0-9a-z]+)$
+      Default : AUTO
+
     AD:
       Description: 'Please, enter your Active Directory ID, or just leave "AUTO" if you want to create a new one.'
       Type: String
@@ -567,6 +576,7 @@ Resources:
             - !Sub echo "export AWS_ACCOUNT=${AWS::AccountId}" >> cluster_env
             - !Sub echo "export S3_BUCKET=${Cloud9OutputBucket}" >> cluster_env
             - !Sub echo "export FSX_ID=${FSx}" >> cluster_env
+            - !Sub echo "export ADMINFSX_ID=${AdminFSx}" >> cluster_env
             - !Sub 
               - echo "export MAP_MIGRATED=${mapmigrated}" >> cluster_env
               - mapmigrated: !Ref MapMigrated

modules-ubuntu/02.activate.passwordless.AD.headnode.sh

@@ -4,7 +4,7 @@ set -e
 source "/etc/parallelcluster/cfnconfig"
 
 activateSSH() {
-    sed -i 's/fallback_homedir = \/home\/%u/override_homedir = \/fsx\/home-%u/g' /etc/sssd/sssd.conf
+    sed -i 's/fallback_homedir = \/home\/%u/override_homedir = \/admin\/home-%u/g' /etc/sssd/sssd.conf
     ROU_PW=$(aws secretsmanager get-secret-value --secret-id "${stack_name}-ROU" --query SecretString --output text --region "${cfn_region}")
     sed -E -i "s|^#?(ldap_default_authtok\s=)\s.*|\1 ${ROU_PW}|" /etc/sssd/sssd.conf
 

modules-ubuntu/02.activate.passwordless.sudo.compute.sh

@@ -4,7 +4,7 @@ set -e
 source "/etc/parallelcluster/cfnconfig"
 
 activateSSSD() {
-    sed -i 's/fallback_homedir = \/home\/%u/override_homedir = \/fsx\/home-%u/g' /etc/sssd/sssd.conf
+    sed -i 's/fallback_homedir = \/home\/%u/override_homedir = \/admin\/home-%u/g' /etc/sssd/sssd.conf
     searchstring="-ComputeFleet"
     stack=${stack_name%$searchstring*}
     ROU_PW=$(aws secretsmanager get-secret-value --secret-id "${stack}-ROU" --query SecretString --output text --region "${cfn_region}")

parallelcluster/config.us-west-2.sample.yaml

@@ -393,6 +393,7 @@ Scheduling:
         AssignPublicIp: ${USE_PUBLIC_IPS}
 SharedStorage:
 ${FSX}
+${ADMINFSX}
 Tags:
   - Key: 1Click-HPC
     Value: 'true'

scripts/Cloud9-Bootstrap.sh

@@ -80,7 +80,31 @@ FSX=$(cat <<EOF
 EOF
 )
 fi
+
+if [[ $ADMINFSX_ID == "AUTO" ]];then
+ADMINFSX=$(cat <<EOF
+  - MountDir: /admin
+    Name: new
+    StorageType: FsxLustre
+    FsxLustreSettings:
+      StorageCapacity: 1200
+      DeploymentType: SCRATCH_2
+      DataCompressionType: LZ4
+EOF
+)
+else
+ADMINFSX=$(cat <<EOF
+  - MountDir: /admin
+    Name: existing
+    StorageType: FsxLustre
+    FsxLustreSettings:
+      FileSystemId: ${ADMINFSX_ID}
+EOF
+)
+fi
+
 export FSX
+export ADMINFSX
 
 if [[ $PRIVATE_SUBNET_ID == "NONE" ]];then
   export SUBNET_ID="${PUBLIC_SUBNET_ID}"
@@ -140,15 +164,29 @@ if [[ $FSX_ID == "AUTO" ]];then
   FSX_ID=$(aws cloudformation describe-stack-resources --stack-name "hpc-1click-${CLUSTER_NAME}" --logical-resource-id FSX0 --query "StackResources[*].PhysicalResourceId" --output text)
 fi
 
+if [[ $ADMINFSX_ID == "AUTO" ]];then
+  ADMINFSX_ID=$(aws cloudformation describe-stack-resources --stack-name "hpc-1click-${CLUSTER_NAME}" --logical-resource-id FSX0 --query "StackResources[*].PhysicalResourceId" --output text)
+fi
+
+
 FSX_DNS_NAME=$(aws fsx describe-file-systems --file-system-ids $FSX_ID --query "FileSystems[*].DNSName" --output text)
 FSX_MOUNT_NAME=$(aws fsx describe-file-systems --file-system-ids $FSX_ID  --query "FileSystems[*].LustreConfiguration.MountName" --output text)
 
+ADMINFSX_DNS_NAME=$(aws fsx describe-file-systems --file-system-ids $ADMINFSX_ID --query "FileSystems[*].DNSName" --output text)
+ADMINFSX_MOUNT_NAME=$(aws fsx describe-file-systems --file-system-ids $ADMINFSX_ID  --query "FileSystems[*].LustreConfiguration.MountName" --output text)
+
+
 #mount the same FSx created for the HPC Cluster
 mkdir fsx
+mkdir admin
 sudo mount -t lustre -o noatime,flock $FSX_DNS_NAME@tcp:/$FSX_MOUNT_NAME fsx
+sudo mount -t lustre -o noatime,flock $ADMINFSX_DNS_NAME@tcp:/$ADMINFSX_MOUNT_NAME admin
 sudo bash -c "echo \"$FSX_DNS_NAME@tcp:/$FSX_MOUNT_NAME /home/ec2-user/environment/fsx lustre defaults,noatime,flock,_netdev 0 0\" >> /etc/fstab"
+sudo bash -c "echo \"$ADMINFSX_DNS_NAME@tcp:/$ADMINFSX_MOUNT_NAME /home/ec2-user/environment/admin lustre defaults,noatime,flock,_netdev 0 0\" >> /etc/fstab"
 sudo chmod 755 fsx
+sudo chmod 755 admin
 sudo chown ec2-user:ec2-user fsx
+sudo chown ec2-user:ec2-user admin
 
 aws s3 cp --quiet bootstrap.log "s3://${S3_BUCKET}/install.log" --region "${AWS_REGION_NAME}"
 aws s3 cp --quiet config.${AWS_REGION_NAME}.yaml "s3://${S3_BUCKET}/config.${AWS_REGION_NAME}.yaml" --region "${AWS_REGION_NAME}"