Sandro Bonazzola has uploaded a new change for review. Change subject: bin: connect-storage: rebase on vdsClient vdsm-cli-4.17.0-415 ......................................................................
bin: connect-storage: rebase on vdsClient vdsm-cli-4.17.0-415 The command line parser used within vdsClient changed causing several parameters to be badly interpreted. Fixed also the connection command line for glusterfs. Change-Id: Ia574d3d73b03b4f9d82d07ba7b73bf9faf8cec76 Bug-Url: https://bugzilla.redhat.com/1173669 Signed-off-by: Sandro Bonazzola <[email protected]> (cherry picked from commit 5f7930da3151edc4820d454c06d7ba640025446f) --- M src/bin/hosted-engine.in 1 file changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-hosted-engine-setup refs/changes/19/38419/1 diff --git a/src/bin/hosted-engine.in b/src/bin/hosted-engine.in index 7a0cf51..b1a73b9 100644 --- a/src/bin/hosted-engine.in +++ b/src/bin/hosted-engine.in @@ -1,7 +1,7 @@ #!/bin/sh # # ovirt-hosted-engine-setup -- ovirt hosted engine setup -# Copyright (C) 2013-2014 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -269,16 +269,21 @@ exit 1 fi echo "Connecting Storage Server" - if [ ! "${domainType}" == "iscsi" ] ; then + if [ "${domainType}" == "glusterfs" ] ; then ${VDSCOMMAND} connectStorageServer \ "${storageType}" \ "${spUUID}" \ - connection="${storage},iqn=,portal=,user=kvm,password=,id=${connectionUUID},port=,protocol_version=${protocol_version}" - else - ${VDSCOMMAND} connectStorageServer \ + connection="${storage},user=kvm,id=${connectionUUID},tpgt=1,vfs_type=glusterfs" + elif [ "${domainType}" == "iscsi" ] ; then + ${VDSCOMMAND} connectStorageServer \ "${storageType}" \ "${spUUID}" \ connection="${storage},iqn=${iqn},portal=${portal},user=${user},password=${password},id=${connectionUUID},port=${port}" + else + ${VDSCOMMAND} connectStorageServer \ + "${storageType}" \ + "${spUUID}" \ + connection="${storage},user=kvm,id=${connectionUUID},protocol_version=${protocol_version}" fi } -- To view, visit https://gerrit.ovirt.org/38419 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia574d3d73b03b4f9d82d07ba7b73bf9faf8cec76 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-hosted-engine-setup Gerrit-Branch: ovirt-hosted-engine-setup-1.2 Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
