Omer Frenkel has submitted this change and it was merged. Change subject: engine: Cluster with Virt and Gluster enabled - configurable ...................................................................... engine: Cluster with Virt and Gluster enabled - configurable A new configuration property is added vdc_options named 'AllowClusterWithVirtGlusterEnabled'. It is to determine whether the user is allowed to create a cluster with both Virt and Gluster services enable or not. It will have the default value as true, so that user can have a cluster with Virt and Gluster enabled. Required entries are added to engine-config.properties. Change-Id: I63c501501545f35ee445861f71ec3c7197d66e06 Signed-off-by: Kanagaraj M <kmayilsa@redhat.com> --- M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsGroupOperationCommandBase.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommandTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M backend/manager/tools/engine-config/src/main/resources/engine-config.properties M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 12 files changed, 48 insertions(+), 1 deletion(-) Approvals: Kanagaraj M: Verified Omer Frenkel: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/7453 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I63c501501545f35ee445861f71ec3c7197d66e06 Gerrit-PatchSet: 6 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Kanagaraj M <kmayilsa@redhat.com> Gerrit-Reviewer: Gilad Chaplik <gchaplik@redhat.com> Gerrit-Reviewer: Kanagaraj M <kmayilsa@redhat.com> Gerrit-Reviewer: Omer Frenkel <ofrenkel@redhat.com> Gerrit-Reviewer: Shireesh Anjal <sanjal@redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server