diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-06-30 14:39:49 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2014-07-02 20:26:52 +1000 |
| commit | 8a96763ff725f19c42817e7882402334077ebbff (patch) | |
| tree | 49d61e544ebe5e06a0fa10c7a8d169ffc9255191 /config.d | |
| parent | 068f2ed64751b7bf8e227d8b5f3f52afb1e813ea (diff) | |
| download | autocluster-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 'config.d')
| -rw-r--r-- | config.d/10shareddisk.defconf | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/config.d/10shareddisk.defconf b/config.d/10shareddisk.defconf index 7b7b645..612ee09 100644 --- a/config.d/10shareddisk.defconf +++ b/config.d/10shareddisk.defconf @@ -78,7 +78,7 @@ shared_disk_template () for SHARED_DISK_NUM in $(seq 1 $SHAREDDISK_COUNT) ; do local DISK="${VIRTBASE}/${CLUSTER}/shared${SHARED_DISK_NUM}" run_hooks hack_disk_hooks "shared" - local serial=$(sed -n "${SHARED_DISK_NUM}p" "$shared_disk_ids") + local serial=$(awk "{ print \$${SHARED_DISK_NUM} }" <<<"$SHARED_DISK_IDS") for p in $(seq 1 $paths) ; do local dev="${devices[$n]}" [ -n "$dev" ] || die "Too many shared disks! The function shared_disk_template needs to be hacked to allow more shared disks..." @@ -111,8 +111,7 @@ register_hook create_cluster_hooks shared_disk_setup shared_disk_setup () { - shared_disk_ids="tmp/shared_disk_ids.${CLUSTER}" - rm -f "$shared_disk_ids" + SHARED_DISK_IDS="" # Early exit if no shared disks have_shared_disks || return 0 @@ -165,7 +164,8 @@ EOF # setup a nice ID at the start of the disk "$SHARED_DISK_ID_GEN" "$SHARED_DISK_NUM" > tmp/diskid dd if=tmp/diskid of="$di" conv=notrunc bs=1 > /dev/null 2>&1 - head -n 1 tmp/diskid >>"$shared_disk_ids" + local this_id=$(head -n 1 tmp/diskid) + SHARED_DISK_IDS="${SHARED_DISK_IDS}${SHARED_DISK_IDS:+ }${this_id}" done echo @@ -183,24 +183,12 @@ shared_disk_id_default () echo "${t:0:13}" } -install_shared_disk_ids () -{ - if [ -r "$shared_disk_ids" ] ; then - local t="/root/scripts/${shared_disk_ids##*/}" - echo "Installing shared disk ID file \"${t}\"" - diskimage mkdir_p "/root/scripts" - diskimage put "$shared_disk_ids" "$t" - fi -} - shared_disk_setup_base () { _SHARED_DISK_TEMPLATE="" node_has_shared_disks "$type" || return 0 - install_shared_disk_ids - if [ "$SHARED_DISK_TYPE" = "iscsi" ] ; then shared_disk_iscsi_setup_base else |