diff options
author | Martin Schwenke <martin@meltin.net> | 2014-07-29 12:12:05 +1000 |
---|---|---|
committer | Martin Schwenke <martin@meltin.net> | 2014-08-12 11:17:20 +1000 |
commit | 6f2f62a859cbd31dbb1e8850c70df2822a560dc1 (patch) | |
tree | c90849dbcbeb754ec9877faefb70af54e9bae1dc | |
parent | bb67c3488db65d74bd1f7d7c1961de06299370c1 (diff) | |
download | autocluster-6f2f62a859cbd31dbb1e8850c70df2822a560dc1.tar.gz autocluster-6f2f62a859cbd31dbb1e8850c70df2822a560dc1.tar.xz autocluster-6f2f62a859cbd31dbb1e8850c70df2822a560dc1.zip |
Move cluster_setup.sh task scriptlets to tasks subdirectory
Signed-off-by: Martin Schwenke <martin@meltin.net>
-rwxr-xr-x | base/all/root/scripts/cluster_setup.sh | 2 | ||||
-rwxr-xr-x | base/all/root/scripts/tasks/install_ad.sh (renamed from base/all/root/scripts/install_ad.sh) | 0 | ||||
-rwxr-xr-x | base/all/root/scripts/tasks/install_build.sh (renamed from base/all/root/scripts/install_build.sh) | 4 | ||||
-rwxr-xr-x | base/all/root/scripts/tasks/install_clusterfs_gpfs.sh (renamed from base/all/root/scripts/install_clusterfs_gpfs.sh) | 0 | ||||
-rwxr-xr-x | base/all/root/scripts/tasks/install_extra_packages.sh (renamed from base/all/root/scripts/install_extra_packages.sh) | 0 | ||||
-rwxr-xr-x | base/all/root/scripts/tasks/install_nas.sh (renamed from base/all/root/scripts/install_nas.sh) | 0 | ||||
-rwxr-xr-x | base/all/root/scripts/tasks/setup_cluster_nas.sh (renamed from base/all/root/scripts/setup_cluster_nas.sh) | 0 | ||||
-rwxr-xr-x | base/all/root/scripts/tasks/setup_clusterfs_gpfs.sh (renamed from base/all/root/scripts/setup_clusterfs_gpfs.sh) | 6 | ||||
-rwxr-xr-x | base/all/root/scripts/tasks/setup_node_ad.sh (renamed from base/all/root/scripts/setup_node_ad.sh) | 0 | ||||
-rwxr-xr-x | base/all/root/scripts/tasks/setup_node_build.sh (renamed from base/all/root/scripts/setup_node_build.sh) | 0 | ||||
-rwxr-xr-x | base/all/root/scripts/tasks/setup_node_nas.sh (renamed from base/all/root/scripts/setup_node_nas.sh) | 0 |
11 files changed, 6 insertions, 6 deletions
diff --git a/base/all/root/scripts/cluster_setup.sh b/base/all/root/scripts/cluster_setup.sh index 28f42f7..302c577 100755 --- a/base/all/root/scripts/cluster_setup.sh +++ b/base/all/root/scripts/cluster_setup.sh @@ -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}\"" diff --git a/base/all/root/scripts/install_ad.sh b/base/all/root/scripts/tasks/install_ad.sh index 75233c4..75233c4 100755 --- a/base/all/root/scripts/install_ad.sh +++ b/base/all/root/scripts/tasks/install_ad.sh diff --git a/base/all/root/scripts/install_build.sh b/base/all/root/scripts/tasks/install_build.sh index 9857e08..73bf651 100755 --- a/base/all/root/scripts/install_build.sh +++ b/base/all/root/scripts/tasks/install_build.sh @@ -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 diff --git a/base/all/root/scripts/install_clusterfs_gpfs.sh b/base/all/root/scripts/tasks/install_clusterfs_gpfs.sh index 018b392..018b392 100755 --- a/base/all/root/scripts/install_clusterfs_gpfs.sh +++ b/base/all/root/scripts/tasks/install_clusterfs_gpfs.sh diff --git a/base/all/root/scripts/install_extra_packages.sh b/base/all/root/scripts/tasks/install_extra_packages.sh index 20b0094..20b0094 100755 --- a/base/all/root/scripts/install_extra_packages.sh +++ b/base/all/root/scripts/tasks/install_extra_packages.sh diff --git a/base/all/root/scripts/install_nas.sh b/base/all/root/scripts/tasks/install_nas.sh index 05482f0..05482f0 100755 --- a/base/all/root/scripts/install_nas.sh +++ b/base/all/root/scripts/tasks/install_nas.sh diff --git a/base/all/root/scripts/setup_cluster_nas.sh b/base/all/root/scripts/tasks/setup_cluster_nas.sh index aa0da82..aa0da82 100755 --- a/base/all/root/scripts/setup_cluster_nas.sh +++ b/base/all/root/scripts/tasks/setup_cluster_nas.sh diff --git a/base/all/root/scripts/setup_clusterfs_gpfs.sh b/base/all/root/scripts/tasks/setup_clusterfs_gpfs.sh index e7ea6cf..2b0df7c 100755 --- a/base/all/root/scripts/setup_clusterfs_gpfs.sh +++ b/base/all/root/scripts/tasks/setup_clusterfs_gpfs.sh @@ -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 diff --git a/base/all/root/scripts/setup_node_ad.sh b/base/all/root/scripts/tasks/setup_node_ad.sh index 0fbdf62..0fbdf62 100755 --- a/base/all/root/scripts/setup_node_ad.sh +++ b/base/all/root/scripts/tasks/setup_node_ad.sh diff --git a/base/all/root/scripts/setup_node_build.sh b/base/all/root/scripts/tasks/setup_node_build.sh index 04d18b6..04d18b6 100755 --- a/base/all/root/scripts/setup_node_build.sh +++ b/base/all/root/scripts/tasks/setup_node_build.sh diff --git a/base/all/root/scripts/setup_node_nas.sh b/base/all/root/scripts/tasks/setup_node_nas.sh index 65fd966..65fd966 100755 --- a/base/all/root/scripts/setup_node_nas.sh +++ b/base/all/root/scripts/tasks/setup_node_nas.sh |