Merge pull request #42 from cmbrehm/main

PC 3.6 fixes - thanks @cmbrehm

Author: nicolaven

Templates/AWS-HPC-Cluster.yaml

@@ -76,6 +76,12 @@ Parameters:
       AllowedPattern: ^(AUTO|ldaps?://.+)$
       Default : AUTO
 
+    GitHubUrl:
+      Description: 'Location of installation files'
+      Type: String
+      AllowedPattern: ^https://.*$
+      Default: https://github.com/aws-samples/1click-hpc
+
 Conditions:
   CreateVpc: !Equals [!Ref VpcId, AUTO]
   CreateAD: !Equals [!Ref AD, AUTO]
@@ -364,7 +370,7 @@ Resources:
             - echo LANG=en_US.utf-8 >> /etc/environment
             - echo LC_ALL=en_US.UTF-8 >> /etc/environment
             - cd /home/ec2-user/environment
-            - git clone "https://github.com/aws-samples/1click-hpc"
+            - !Sub git clone ${GitHubUrl}
             - !Sub echo "export AWS_DEFAULT_REGION=${AWS::Region}" >> cluster_env
             - !Sub echo "export AWS_REGION_NAME=${AWS::Region}" >> cluster_env
             - !Sub echo "export S3_BUCKET=${Cloud9OutputBucket}" >> cluster_env

scripts/Cloud9-Bootstrap.sh

@@ -54,10 +54,12 @@ export FSX
 /usr/bin/envsubst '${SLURM_DB_ENDPOINT}' < "1click-hpc/enginframe/mysql/efdb.config" > efdb.config
 /usr/bin/envsubst '${SLURM_DB_ENDPOINT}' < "1click-hpc/enginframe/efinstall.config" > efinstall.config
 /usr/bin/envsubst '${S3_BUCKET}' < "1click-hpc/enginframe/fm.browse.ui" > fm.browse.ui
+/usr/bin/envsubst '${POST_INSTALL}' < "1click-hpc/scripts/post.install.sh" > post.install.sh
 
 aws s3 cp --quiet efinstall.config "s3://${S3_BUCKET}/1click-hpc/enginframe/efinstall.config" --region "${AWS_REGION_NAME}"
 aws s3 cp --quiet fm.browse.ui "s3://${S3_BUCKET}/1click-hpc/enginframe/fm.browse.ui" --region "${AWS_REGION_NAME}"
 aws s3 cp --quiet efdb.config "s3://${S3_BUCKET}/1click-hpc/enginframe/mysql/efdb.config" --region "${AWS_REGION_NAME}"
+aws s3 cp --quiet post.install.sh "s3://${S3_BUCKET}/1click-hpc/scripts/post.install.sh" --region "${AWS_REGION_NAME}"
 aws s3 cp --quiet /usr/bin/mysql "s3://${S3_BUCKET}/1click-hpc/enginframe/mysql/mysql" --region "${AWS_REGION_NAME}"
 rm -f fm.browse.ui efinstall.config
 

scripts/post.install.sh

@@ -43,11 +43,10 @@ main() {
     runScripts "${@}"
     echo "[INFO][$(date '+%Y-%m-%d %H:%M:%S')] post.install.sh: STOP" >&2
 }
-
 TMP_MODULES_DIR="/tmp/modules/"
 export host_name=$(hostname -s)
 export SLURM_CONF_FILE="/opt/slurm/etc/pcluster/slurm_parallelcluster_*_partition.conf"
-post_install_url=$(dirname ${cfn_postinstall})
+post_install_url=$(dirname ${POST_INSTALL})
 export post_install_base=$(dirname "${post_install_url}")
 SLURM_ROOT="/opt/slurm"
 export SLURM_ETC="${SLURM_ROOT}/etc"