From 7d248c9c924cc005133a9bcc176f0b5b6522e93f Mon Sep 17 00:00:00 2001 From: Jianghua Wang Date: Tue, 27 Mar 2018 07:22:14 +0000 Subject: [PATCH] Remove the restriction that SR must be FS based SR We can support non-FS based SR with the supporting on VDI streaming feature. And VDI steaming will be the default image handler. So this commit is to change the installation script to allow no-FS SR types. For the VDI streaming feature, please check the depends-on. Depends-On: I0ad8e34808401ace9b85e1b937a542f4c4e61690 Change-Id: Iea687f17ab12e30e8dc55cbecdcfd8991d402fc8 --- tools/install_on_xen_host.sh | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/tools/install_on_xen_host.sh b/tools/install_on_xen_host.sh index f22b8b5..64bfce1 100755 --- a/tools/install_on_xen_host.sh +++ b/tools/install_on_xen_host.sh @@ -36,7 +36,6 @@ optional arguments: it is done -r DISABLE_JOURNALING Disable journaling if this flag is set. It will reduce disk IO, but may lead to file system unstable after long time use - flags: -f Force SR replacement. If your XenServer has an LVM type SR, it will be destroyed and replaced with an ext SR. @@ -101,10 +100,12 @@ fi # begin install devstack process ## -# Verify the host is suitable for devstack -echo -n "Verify XenServer has an ext type default SR..." +# Check the host's SR type. defaultSR=$(xe pool-list params=default-SR minimal=true) currentSrType=$(xe sr-param-get uuid=$defaultSR param-name=type) + +echo "The SR type is $currentSrType." + if [ "$currentSrType" != "ext" -a "$currentSrType" != "nfs" -a "$currentSrType" != "ffs" -a "$currentSrType" != "file" ]; then if [ "true" == "$FORCE_SR_REPLACEMENT" ]; then echo "" @@ -126,16 +127,6 @@ if [ "$currentSrType" != "ext" -a "$currentSrType" != "nfs" -a "$currentSrType" xe sr-param-add uuid=$sr_uuid param-name=other-config i18n-key=local-storage exit 0 fi - echo "" - echo "" - echo "ERROR: The xenserver host must have an EXT3/NFS/FFS/File SR as the default SR" - echo "Use the -f flag to destroy the current default SR and create a new" - echo "ext type default SR." - echo "" - echo "WARNING: This will destroy your actual default SR !" - echo "" - - exit 1 fi # create template if needed