Sharad Mishra has uploaded a new change for review. Change subject: engine: Set mnt_option, vfsType for glusterfs. ......................................................................
engine: Set mnt_option, vfsType for glusterfs. Modified this condition to allow setting mnt_option, vfsType etc. for glusterfs. Not sure if this is the right approach, the ConfigValues.AdvancedNFSOptionsEnabled is only set for versions 3.1 and 3.2, Which makes this test fail and prevents setting of additional options. Change-Id: I59da21e77d2bc37a3963c711c5b5cea73ff5fdbf Signed-off-by: Sharad Mishra <snmis...@linux.vnet.ibm.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/55/13155/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java index b5989ff..393f898 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java @@ -8,6 +8,7 @@ import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageServerConnections; +import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.storage_pool; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; @@ -81,8 +82,10 @@ // storage_pool can be null when discovering iscsi send targets or when connecting // through vds which has no storage pool - if (storage_pool == null || Config.<Boolean> GetValue(ConfigValues.AdvancedNFSOptionsEnabled, - storage_pool.getcompatibility_version().getValue())) { + if ((storage_pool == null) + || Config.<Boolean> GetValue(ConfigValues.AdvancedNFSOptionsEnabled, + storage_pool.getcompatibility_version().getValue()) + || connection.getstorage_type().equals(StorageType.GLUSTERFS)) { // For mnt_options, vfs_type, and protocol_version - if they are null // or empty we should not send a key with an empty value con.putIfNotEmpty("mnt_options", connection.getMountOptions()); -- To view, visit http://gerrit.ovirt.org/13155 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I59da21e77d2bc37a3963c711c5b5cea73ff5fdbf Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sharad Mishra <snmis...@linux.vnet.ibm.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches