cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [1/2] git commit: updated refs/heads/4.9 to ee83b02
Date Mon, 26 Dec 2016 15:27:35 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.9 20986ba51 -> ee83b02c7


CLOUDSTACK-9662: Fix failing iscsi test

Use separate lvcreate command on XenServer7 hosts, that checks and passes
different parameters based on the xenserver release version.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2ce02dc9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2ce02dc9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2ce02dc9

Branch: refs/heads/4.9
Commit: 2ce02dc9378e5805957b8d4fcdc7b1ad41d1165c
Parents: 20986ba
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Sat Dec 24 08:50:03 2016 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Sun Dec 25 23:53:50 2016 +0530

----------------------------------------------------------------------
 scripts/vm/hypervisor/xenserver/setup_heartbeat_sr.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ce02dc9/scripts/vm/hypervisor/xenserver/setup_heartbeat_sr.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/setup_heartbeat_sr.sh b/scripts/vm/hypervisor/xenserver/setup_heartbeat_sr.sh
index 9cea826..5d70cd3 100755
--- a/scripts/vm/hypervisor/xenserver/setup_heartbeat_sr.sh
+++ b/scripts/vm/hypervisor/xenserver/setup_heartbeat_sr.sh
@@ -71,8 +71,12 @@ else
         dmsetup remove -f $devmapper
       fi
       rm $link -f
-    fi 
-    lvcreate VG_XenStorage-$2 -n hb-$1 --size 4M  --config global{metadata_read_only=0}
+    fi
+    if [ -f /etc/redhat-release ] && grep -q "XenServer release 7." /etc/redhat-release;
then
+        lvcreate VG_XenStorage-$2 -n hb-$1 --size 4M --config global{metadata_read_only=0}
+    else
+        lvcreate VG_XenStorage-$2 -n hb-$1 --size 4M
+    fi
     if [ $? -ne 0 ]; then
       echo "#6# Unable to create heartbeat volume hb-$1"
       exit 0


Mime
View raw message