Move cluster_setup.sh task scriptlets to tasks subdirectory
authorMartin Schwenke <martin@meltin.net>
Tue, 29 Jul 2014 02:12:05 +0000 (12:12 +1000)
committerMartin Schwenke <martin@meltin.net>
Tue, 12 Aug 2014 01:17:20 +0000 (11:17 +1000)
Signed-off-by: Martin Schwenke <martin@meltin.net>
base/all/root/scripts/cluster_setup.sh
base/all/root/scripts/tasks/install_ad.sh [moved from base/all/root/scripts/install_ad.sh with 100% similarity]
base/all/root/scripts/tasks/install_build.sh [moved from base/all/root/scripts/install_build.sh with 77% similarity]
base/all/root/scripts/tasks/install_clusterfs_gpfs.sh [moved from base/all/root/scripts/install_clusterfs_gpfs.sh with 100% similarity]
base/all/root/scripts/tasks/install_extra_packages.sh [moved from base/all/root/scripts/install_extra_packages.sh with 100% similarity]
base/all/root/scripts/tasks/install_nas.sh [moved from base/all/root/scripts/install_nas.sh with 100% similarity]
base/all/root/scripts/tasks/setup_cluster_nas.sh [moved from base/all/root/scripts/setup_cluster_nas.sh with 100% similarity]
base/all/root/scripts/tasks/setup_clusterfs_gpfs.sh [moved from base/all/root/scripts/setup_clusterfs_gpfs.sh with 99% similarity]
base/all/root/scripts/tasks/setup_node_ad.sh [moved from base/all/root/scripts/setup_node_ad.sh with 100% similarity]
base/all/root/scripts/tasks/setup_node_build.sh [moved from base/all/root/scripts/setup_node_build.sh with 100% similarity]
base/all/root/scripts/tasks/setup_node_nas.sh [moved from base/all/root/scripts/setup_node_nas.sh with 100% similarity]

index 28f42f7..302c577 100755 (executable)
@@ -24,7 +24,7 @@ for task ; do
            file="${prefix}_${task}.sh"
     esac
 
-    path="${dn}/${file}"
+    path="${dn}/tasks/${file}"
 
     if [ ! -x "$path" ] ; then
        echo "Unable to find script \"${file}\" for stage \"${stage}\" task \"${task}\""
similarity index 77%
rename from base/all/root/scripts/install_build.sh
rename to base/all/root/scripts/tasks/install_build.sh
index 9857e08..73bf651 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Setup RPM development                                                         
+# Setup RPM development
 echo "Installing RPM developing and setting up rpm build"
 yum -y install rpmdevtools
 
@@ -10,7 +10,7 @@ yum -y install rpmdevtools
 echo "Installing PCP development libraries - this may fail"
 yum -y install pcp-libs pcp-libs-devel
 
-# Packages required for samba development                                       
+# Packages required for samba development
 echo "Installing Samba build dependencies"
 yum -y install readline-devel libacl-devel e2fsprogs-devel \
     libxslt docbook-utils docbook-style-xsl
similarity index 99%
rename from base/all/root/scripts/setup_clusterfs_gpfs.sh
rename to base/all/root/scripts/tasks/setup_clusterfs_gpfs.sh
index e7ea6cf..2b0df7c 100755 (executable)
@@ -24,7 +24,7 @@ dir=$(dirname "$0")
 # the script there.
 if [ -n "$nodes_storage_gpfs" -a \
     "${HOSTNAME%%.*}" != "${nodes_storage_gpfs%%[.,]*}" ] ; then
-    if [ "${0#/}" != "$0" ] ; then 
+    if [ "${0#/}" != "$0" ] ; then
        script="$0"
     else
        script="${PWD}/${0}"
@@ -169,7 +169,7 @@ gpfs_mkfs ()
     fi <"$nsdfile" >"$nsdfile2"
 
     chattr +i "$mountpoint"
-    
+
     mmcrfs gpfs0 -F "$nsdfile2" \
        -A yes -Q yes -D nfs4 -B 64k -k nfs4 -n 32 -E yes -S no \
        -T "$mountpoint" -i 512
@@ -179,7 +179,7 @@ gpfs_mkfs ()
 
 gpfs_mount ()
 {
-    echo 
+    echo
     echo "Mounting filesystem"
     mmmount gpfs0 -a