Fix create_user_groups.py when /usr/sbin not in path (#163)

If /usr/sbin isn't in the path then the useradd and groupadd commands fail.
Add the path to the commands.
Add /usr/sbin to the path inside the on_node_* scripts.

Move creation of users and groups to on_compute_node_configured.sh because
/opt/slurm isn't mounted before running on_compute_node_start.sh.

Resolves #161

Author: cartalla

source/resources/parallel-cluster/config/bin/create_users_groups.py

@@ -26,7 +26,7 @@
 import subprocess
 
 logger = logging.getLogger(__file__)
-logger_formatter = logging.Formatter('%(levelname)s: %(message)s')
+logger_formatter = logging.Formatter('%(levelname)s:%(asctime)s: %(message)s')
 logger_streamHandler = logging.StreamHandler()
 logger_streamHandler.setFormatter(logger_formatter)
 logger.addHandler(logger_streamHandler)
@@ -46,7 +46,8 @@ def main(filename):
             continue
         logger.debug("Creating group {}({})".format(gid, group_name))
         try:
-            subprocess.check_output(['groupadd', '-g', gid, group_name], stderr=subprocess.STDOUT)
+            subprocess.check_output(['/usr/sbin/groupadd', '-g', gid, group_name], stderr=subprocess.STDOUT)
+            logger.info("Created group {}({})".format(gid, group_name))
         except subprocess.CalledProcessError as e:
             lines = e.output.decode('utf-8')
             if 'is not a valid group name' in lines:
@@ -75,12 +76,13 @@ def main(filename):
             if invalid_gid in gids:
                 logger.debug("Removed {}".format(invalid_gid))
                 gids.remove(invalid_gid)
-        useradd_args = ['useradd', '--uid', uid, '--gid', gid, '--groups', ','.join(gids), user, '--no-create-home']
+        useradd_args = ['/usr/sbin/useradd', '--uid', uid, '--gid', gid, '--groups', ','.join(gids), user, '--no-create-home']
         if config['users'][user].get('home', None):
             useradd_args.append('--home-dir')
             useradd_args.append(config['users'][user]['home'])
         try:
             subprocess.check_output(useradd_args, stderr=subprocess.STDOUT)
+            logger.info("Created user {}({})".format(uid, user))
         except subprocess.CalledProcessError as e:
             lines = e.output.decode('utf-8')
             logger.debug(f"lines:\n{lines}")
@@ -98,11 +100,6 @@ def main(filename):
     parser.add_argument('--debug', '-d', action='count', default=False, help="Enable debug messages")
     args = parser.parse_args()
 
-    logger_formatter = logging.Formatter('%(levelname)s:%(asctime)s: %(message)s')
-    logger_streamHandler = logging.StreamHandler()
-    logger_streamHandler.setFormatter(logger_formatter)
-    logger.addHandler(logger_streamHandler)
-    logger.setLevel(logging.INFO)
     if args.debug:
         logger.setLevel(logging.DEBUG)
 

source/resources/parallel-cluster/config/bin/on_compute_node_configured.sh

@@ -1,5 +1,9 @@
 #!/bin/bash -x
 
+set -x
+
+exec 1> >(logger -s -t on_compute_node_configured.sh) 2>&1
+
 full_script=$(realpath $0)
 script_dir=$(dirname $full_script)
 base_script=$(basename $full_script)
@@ -20,7 +24,12 @@ if [ $full_script != $dest_script ]; then
     chmod 0700 $dest_script
 fi
 
-ansible_compute_node_vars_yml_s3_url="s3://$assets_bucket/$assets_base_key/config/ansible/ansible_compute_node_vars.yml"
+export PATH=/usr/sbin:$PATH
+
+echo "Creating users and groups"
+$config_bin_dir/create_users_groups.py -i $config_dir/users_groups.json
+
+# ansible_compute_node_vars_yml_s3_url="s3://$assets_bucket/$assets_base_key/config/ansible/ansible_compute_node_vars.yml"
 
 # # Configure using ansible
 # if ! yum list installed ansible &> /dev/null; then

source/resources/parallel-cluster/config/bin/on_compute_node_start.sh

@@ -1,26 +1,19 @@
 #!/bin/bash -x
 
+set -x
+
+exec 1> >(logger -s -t on_compute_node_start.sh) 2>&1
+
 full_script=$(realpath $0)
 script_dir=$(dirname $full_script)
 base_script=$(basename $full_script)
 
 date
 echo "Started on_compute_node_start.sh: $full_script"
 
-config_dir=/opt/slurm/config
-config_bin_dir=$config_dir/bin
-
-assets_bucket={{assets_bucket}}
-assets_base_key={{assets_base_key}}
-
-dest_script="$config_bin_dir/on_compute_node_start.sh"
-if [ $full_script != $dest_script ]; then
-    echo "cp $full_script $dest_script"
-    cp $full_script $dest_script
-    chmod 0700 $dest_script
-fi
+# /opt/slurm isn't mounted yet.
 
-$config_bin_dir/create_users_groups.py -i $config_dir/users_groups.json
+export PATH=/usr/sbin:$PATH
 
 date
 echo "Finished on_compute_node_start.sh: $full_script"

source/resources/parallel-cluster/config/bin/on_head_node_configured.sh

@@ -1,5 +1,9 @@
 #!/bin/bash -x
 
+set -x
+
+exec 1> >(logger -s -t on_head_node_configured.sh) 2>&1
+
 full_script=$(realpath $0)
 script_dir=$(dirname $full_script)
 base_script=$(basename $full_script)
@@ -19,6 +23,8 @@ if [ $full_script != $dest_script ]; then
     chmod 0700 $dest_script
 fi
 
+export PATH=/usr/sbin:$PATH
+
 $config_bin_dir/on_head_node_start.sh
 
 pushd $PLAYBOOKS_PATH

source/resources/parallel-cluster/config/bin/on_head_node_start.sh

@@ -1,5 +1,9 @@
 #!/bin/bash -x
 
+set -x
+
+exec 1> >(logger -s -t on_head_node_start.sh) 2>&1
+
 full_script=$(realpath $0)
 script_dir=$(dirname $full_script)
 base_script=$(basename $full_script)
@@ -59,6 +63,8 @@ if ! [ -e $config_dir/users_groups.json ]; then
 fi
 chmod 0600 $config_dir/users_groups.json
 
+export PATH=/usr/sbin:$PATH
+
 $config_bin_dir/create_users_groups.py -i $config_dir/users_groups.json
 
 # Configure using ansible

source/resources/parallel-cluster/config/bin/on_head_node_updated.sh

@@ -1,5 +1,9 @@
 #!/bin/bash -x
 
+set -x
+
+exec 1> >(logger -s -t on_head_node_updated.sh) 2>&1
+
 full_script=$(realpath $0)
 script_dir=$(dirname $full_script)
 base_script=$(basename $full_script)
@@ -17,6 +21,8 @@ if [ $full_script != $dest_script ]; then
     chmod 0700 $dest_script
 fi
 
+export PATH=/usr/sbin:$PATH
+
 $config_bin_dir/on_head_node_configured.sh
 
 date