You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/12/26 15:31:39 UTC
[1/3] git commit: updated refs/heads/master to 0db4471
Repository: cloudstack
Updated Branches:
refs/heads/master ec847a890 -> 0db4471be
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 <ro...@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/master
Commit: 2ce02dc9378e5805957b8d4fcdc7b1ad41d1165c
Parents: 20986ba
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Sat Dec 24 08:50:03 2016 +0530
Committer: Rohit Yadav <ro...@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
[3/3] git commit: updated refs/heads/master to 0db4471
Posted by bh...@apache.org.
Merge branch '4.9'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0db4471b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0db4471b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0db4471b
Branch: refs/heads/master
Commit: 0db4471be0ecc2ba1a1541e2dcd94b5bf2bcd856
Parents: ec847a8 ee83b02
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Mon Dec 26 21:01:20 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Dec 26 21:01:20 2016 +0530
----------------------------------------------------------------------
scripts/vm/hypervisor/xenserver/setup_heartbeat_sr.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: updated refs/heads/master to 0db4471
Posted by bh...@apache.org.
Merge pull request #1863 from shapeblue/xs7-iscsifixtest
Smoke tests xen:iscsi fix
* pr/1863:
CLOUDSTACK-9662: Fix failing iscsi test
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ee83b02c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ee83b02c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ee83b02c
Branch: refs/heads/master
Commit: ee83b02c7640ec69e1ec0a16a071ac2d5b7575b6
Parents: 20986ba 2ce02dc
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Mon Dec 26 20:52:48 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Dec 26 20:57:11 2016 +0530
----------------------------------------------------------------------
scripts/vm/hypervisor/xenserver/setup_heartbeat_sr.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------