Restore cfn_ prefix in cfnconfig variables

+ Add check for expected variables in fetch_and_run script

Signed-off-by: Enrico Usai <[email protected]>

Author: Enrico Usai

files/default/setup-ephemeral-drives.sh

@@ -17,8 +17,8 @@ LVM_PATH="/dev/${LVM_VG_NAME}/${LVM_NAME}"
 LVM_ACTIVE_STATE="a"
 FS_TYPE="ext4"
 MOUNT_OPTIONS="noatime,nodiratime"
-# ephemeral_dir is set by cfnconfig
-INPUT_MOUNTPOINT="${ephemeral_dir}"
+# cfn_ephemeral_dir is set in the environment by cfnconfig sourcing
+INPUT_MOUNTPOINT="${cfn_ephemeral_dir}"
 
 function log {
   SCRIPT=$(basename "$0")

templates/default/cfnconfig.erb

@@ -1,22 +1,22 @@
-stack_name=<%= node['cluster']['stack_name'] %>
-preinstall=<%= node['cluster']['preinstall'] %>
-preinstall_args=(<%= node['cluster']['preinstall_args'] %>)
-postinstall=<%= node['cluster']['postinstall'] %>
-postinstall_args=(<%= node['cluster']['postinstall_args'] %>)
-region=<%= node['cluster']['region'] %>
-scheduler=<%= node['cluster']['scheduler'] %>
-scheduler_slots=<%= node['cluster']['scheduler_slots'] %>
-instance_slots=<%= node['cluster']['instance_slots'] %>
-ephemeral_dir=<%= node['cluster']['ephemeral_dir'] %>
-ebs_shared_dirs=<%= node['cluster']['ebs_shared_dirs'] %>
-proxy=<%= node['cluster']['proxy'] %>
-node_type=<%= node['cluster']['node_type'] %>
-cluster_user=<%= node['cluster']['cluster_user'] %>
+cfn_stack_name=<%= node['cluster']['stack_name'] %>
+cfn_preinstall=<%= node['cluster']['preinstall'] %>
+cfn_preinstall_args=(<%= node['cluster']['preinstall_args'] %>)
+cfn_postinstall=<%= node['cluster']['postinstall'] %>
+cfn_postinstall_args=(<%= node['cluster']['postinstall_args'] %>)
+cfn_region=<%= node['cluster']['region'] %>
+cfn_scheduler=<%= node['cluster']['scheduler'] %>
+cfn_scheduler_slots=<%= node['cluster']['scheduler_slots'] %>
+cfn_instance_slots=<%= node['cluster']['instance_slots'] %>
+cfn_ephemeral_dir=<%= node['cluster']['ephemeral_dir'] %>
+cfn_ebs_shared_dirs=<%= node['cluster']['ebs_shared_dirs'] %>
+cfn_proxy=<%= node['cluster']['proxy'] %>
+cfn_node_type=<%= node['cluster']['node_type'] %>
+cfn_cluster_user=<%= node['cluster']['cluster_user'] %>
 <% if node['cluster']['node_type'] == 'ComputeFleet' -%>
-head_node=<%= node['cluster']['head_node'] %>
-head_node_private_ip=<%= node['cluster']['head_node_private_ip'] %>
-scheduler_queue_name=<%= node['cluster']['scheduler_queue_name'] %>
+  cfn_head_node=<%= node['cluster']['head_node'] %>
+  cfn_head_node_private_ip=<%= node['cluster']['head_node_private_ip'] %>
+  cfn_scheduler_queue_name=<%= node['cluster']['scheduler_queue_name'] %>
 <% end -%>
 <% if node['cluster']['node_type'] == 'HeadNode' -%>
-volume=<%= node['cluster']['volume'] %>
+  cfn_volume=<%= node['cluster']['volume'] %>
 <% end -%>

templates/default/fetch_and_run.erb

@@ -1,12 +1,20 @@
 #!/bin/bash
 
-. /etc/parallelcluster/cfnconfig
+cfnconfig_file="/etc/parallelcluster/cfnconfig"
+. ${cfnconfig_file}
+
+# Check expected variables from cfnconfig file
+function check_params () {
+  if [ -z "${cfn_region}" ] || [ -z "${cfn_preinstall}" ] || [ -z "${cfn_preinstall_args}" ] || [ -z "${cfn_postinstall}" ] || [ -z "${cfn_postinstall_args}" ]; then
+    error_exit "One or more required variables from ${cfnconfig_file} file are undefined"
+  fi
+}
 
 # Error exit function
 function error_exit () {
   script=`basename $0`
-  echo "parallelcluster: $script - $1"
-  logger -t parallelcluster "$script - $1"
+  echo "parallelcluster: ${script} - $1"
+  logger -t parallelcluster "${script} - $1"
   exit 1
 }
 
@@ -17,50 +25,48 @@ function download_run (){
     tmpfile=$(mktemp)
     trap "/bin/rm -f $tmpfile" RETURN
     if [ "${scheme}" == "s3" ]; then
-      <%= node['cluster']['cookbook_virtualenv_path'] %>/bin/aws --region ${region} s3 cp ${url} - > $tmpfile || return 1
+      <%= node['cluster']['cookbook_virtualenv_path'] %>/bin/aws --region ${cfn_region} s3 cp ${url} - > $tmpfile || return 1
     else
       wget -qO- ${url} > $tmpfile || return 1
     fi
     chmod +x $tmpfile || return 1
-    $tmpfile "$@" || error_exit "Failed to run $ACTION, $file failed with non 0 return code: $?"
+    $tmpfile "$@" || error_exit "Failed to run ${ACTION}, ${file} failed with non 0 return code: $?"
 }
 
 function run_preinstall () {
-  if [ "${preinstall}" != "NONE" ]; then
-    file="${preinstall}"
-    if [ "${preinstall_args}" != "NONE" ]; then
-        download_run ${preinstall} "${preinstall_args[@]}"
+  if [ "${cfn_preinstall}" != "NONE" ]; then
+    file="${cfn_preinstall}"
+    if [ "${cfn_preinstall_args}" != "NONE" ]; then
+        download_run ${cfn_preinstall} "${cfn_preinstall_args[@]}"
     else
-        download_run ${preinstall}
+        download_run ${cfn_preinstall}
     fi
   fi || error_exit "Failed to run preinstall"
 }
 
 function run_postinstall () {
   RC=0
-  if [ "${postinstall}" != "NONE" ]; then
-    file="${postinstall}"
-    if [ "${postinstall_args}" != "NONE" ]; then
-        download_run ${postinstall} "${postinstall_args[@]}"
+  if [ "${cfn_postinstall}" != "NONE" ]; then
+    file="${cfn_postinstall}"
+    if [ "${cfn_postinstall_args}" != "NONE" ]; then
+        download_run ${cfn_postinstall} "${cfn_postinstall_args[@]}"
     else
-        download_run ${postinstall}
+        download_run ${cfn_postinstall}
     fi
   fi || error_exit "Failed to run postinstall"
 }
 
-ACTION=${1#?}
+check_params
 
-case $ACTION in
+ACTION=${1#?}
+case ${ACTION} in
   preinstall)
     run_preinstall
     ;;
-
   postinstall)
     run_postinstall
     ;;
-
   *)
     echo "Unknown action. Exit gracefully"
     exit 0
-
 esac