Calculate SHARED_DISK_PREFIX automatically

diff --git a/config.d/00base.defconf b/config.d/00base.defconf
index 02516406eb09b37d817b29f2ea01634f7666193f..878150edded662ae0ddab6b0d76f8909440435e8 100644 (file)
--- a/config.d/00base.defconf
+++ b/config.d/00base.defconf
@@ -73,19 +73,19 @@ defconf BASE_FORMAT "qcow2" \
 defconf SYSTEM_DISK_TYPE "scsi" \
        "scsi|ide|virtio" "type of disks to use in nodes"
 
-rhel_system_disk_prefix ()
+rhel_disk_prefix ()
 {
-    case "$SYSTEM_DISK_TYPE" in
+    case "$1" in
        (scsi)   echo "sd" ;;
        (virtio) echo "vd" ;;
        ide)
            case "$RHEL_VERSION" in
                (5.*) echo "hd" ;;
                (6.*) echo "sd" ;;
-               (*) die "Unknow RHEL_VERSION in rhel_system_disk_prefix" ;;
+               (*) die "Unknow RHEL_VERSION in rhel_disk_prefix" ;;
            esac
            ;;
-       (*) die "Unknow SYSTEM_DISK_TYPE in rhel_system_disk_prefix" ;;
+       (*) die "Unknow SYSTEM_DISK_TYPE in rhel_disk_prefix" ;;
            
     esac
 }
@@ -348,7 +348,7 @@ rhel_post_config_hook ()
     fi
 
     if [ "$SYSTEM_DISK_PREFIX" = "@uto" ] ; then
-       SYSTEM_DISK_PREFIX=$(rhel_system_disk_prefix)
+       SYSTEM_DISK_PREFIX=$(rhel_disk_prefix $SYSTEM_DISK_TYPE)
     fi
 }
 

diff --git a/config.d/10shareddisk.defconf b/config.d/10shareddisk.defconf
index a0b967d0118e21be24bf2f34ae025f99049dc561..30bdb206c57036642507cf127418a2d46f1cebc4 100644 (file)
--- a/config.d/10shareddisk.defconf
+++ b/config.d/10shareddisk.defconf
@@ -14,7 +14,7 @@ defconf SHAREDDISK_TEMPLATE "|shared_disk_template" \
 defconf SHARED_DISK_TYPE "scsi" \
        "scsi|ide|virtio|iscsi" "type of disks to use for shared disks"
 
-defconf SHARED_DISK_PREFIX "sd" \
+defconf SHARED_DISK_PREFIX "@uto" \
        "sd|hd|vd" "shared disk device prefix"
 
 defconf SHARED_DISK_CACHE "default" \
@@ -93,6 +93,15 @@ EOF
 
 ##############################
 
+shared_disk_post_config_hook()
+{
+    if [ "$SHARED_DISK_PREFIX" = "@uto" ] ; then
+       SHARED_DISK_PREFIX=$(rhel_disk_prefix $SHARED_DISK_TYPE)
+    fi
+}
+
+register_hook post_config_hooks shared_disk_post_config_hook
+
 shared_disk_ids="tmp/shared_disk_ids"
 
 register_hook create_cluster_hooks shared_disk_setup