Ramesh N has uploaded a new change for review. Change subject: gluster : add gluster prefix to gluster storage device configs ......................................................................
gluster : add gluster prefix to gluster storage device configs Add gluster prefix to all config variables for storage device. Change-Id: I96e261ad48f404add0b700c35139df8020cb7349 Signed-off-by: Ramesh Nachimuthu <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetUnusedGlusterBricksQuery.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/HostGlusterStorageDevicesListModel.java 2 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/40200/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetUnusedGlusterBricksQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetUnusedGlusterBricksQuery.java index 3cfcfca..871ed5b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetUnusedGlusterBricksQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetUnusedGlusterBricksQuery.java @@ -34,11 +34,12 @@ for (GlusterBrickEntity brick : usedBricks) { bricksDir.add(brick.getBrickDirectory()); } + for (StorageDevice storageDevice : storageDevicesInHost) { if (storageDevice.getMountPoint() != null && !storageDevice.getMountPoint().isEmpty() && (storageDevice.getMountPoint() - .startsWith(Config.<String> getValue(ConfigValues.DefaultGlusterBrickMountPoint)) + .startsWith(Config.<String> getValue(ConfigValues.GlusterDefaultBrickMountPoint)) || storageDevice.isGlusterBrick()) && !bricksDir.contains(storageDevice.getMountPoint())) { freeBricks.add(storageDevice); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/HostGlusterStorageDevicesListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/HostGlusterStorageDevicesListModel.java index faefb42..d6dfa4e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/HostGlusterStorageDevicesListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/HostGlusterStorageDevicesListModel.java @@ -149,7 +149,7 @@ } }; AsyncDataProvider.getInstance() - .getConfigFromCache(new GetConfigurationValueParameters(ConfigurationValues.DefaultGlusterBrickMountPoint, + .getConfigFromCache(new GetConfigurationValueParameters(ConfigurationValues.GlusterDefaultBrickMountPoint, AsyncDataProvider.getInstance().getDefaultConfigurationVersion()), asyncQueryForDefaultMountPoint); -- To view, visit https://gerrit.ovirt.org/40200 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I96e261ad48f404add0b700c35139df8020cb7349 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5-gluster Gerrit-Owner: Ramesh N <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
