summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2014-06-30 14:39:49 +1000
committerMartin Schwenke <martin@meltin.net>2014-07-02 20:26:52 +1000
commit8a96763ff725f19c42817e7882402334077ebbff (patch)
tree49d61e544ebe5e06a0fa10c7a8d169ffc9255191 /base
parent068f2ed64751b7bf8e227d8b5f3f52afb1e813ea (diff)
downloadautocluster-8a96763ff725f19c42817e7882402334077ebbff.tar.gz
autocluster-8a96763ff725f19c42817e7882402334077ebbff.tar.xz
autocluster-8a96763ff725f19c42817e7882402334077ebbff.zip
Store shared disk IDs in a variable instead of a file
Signed-off-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'base')
-rwxr-xr-xbase/all/root/scripts/setup_clusterfs_gpfs.sh9
1 files changed, 2 insertions, 7 deletions
diff --git a/base/all/root/scripts/setup_clusterfs_gpfs.sh b/base/all/root/scripts/setup_clusterfs_gpfs.sh
index 8ab0156..e7ea6cf 100755
--- a/base/all/root/scripts/setup_clusterfs_gpfs.sh
+++ b/base/all/root/scripts/setup_clusterfs_gpfs.sh
@@ -10,6 +10,7 @@ gpfs_num_nsds="@@GPFS_DEFAULT_NSDS@@"
cluster_name="@@CLUSTER@@"
mountpoint="@@CLUSTERFS_DEFAULT_MOUNTPOINT@@"
nodes_storage_gpfs="@@NODES_STORAGE_GPFS@@"
+shared_disk_ids="@@SHARED_DISK_IDS@@"
dir=$(dirname "$0")
@@ -132,14 +133,8 @@ gpfs_mknsd ()
echo
echo "Setting up NSDs"
- _idfile="${dir}/shared_disk_ids.${cluster_name}"
- if [ ! -r "$_idfile" ] ; then
- echo "ERROR: missing disk ID file \"${_idfile}\""
- exit 1
- fi
-
# Create an extended regexp that matches any of the IDs
- pat=$(tr '\n' '|' <"$_idfile" | sed -e 's@|$@@')
+ pat=$(echo "$shared_disk_ids" | sed -e 's@ *@|@g')
# Now get devices and names from multipath
multipath -dl |