10:41 p.m.
Tal Nisan has submitted this change and it was merged.
Change subject: core: disable the mixing of RHEL6 and RHEL7 in one cluster
......................................................................
core: disable the mixing of RHEL6 and RHEL7 in one cluster
This patch handles the special case, that the RHEL6 and RHEL7 can not be mixed
in one cluster even the emulated machines are the same.
If the newly added host is not compatible with the rest of the hosts, it is
turned to be non operational.
Change-Id: Ieb6d41b1921a6caf946cba44a6c92ef86fef6bc8
Bug-Url: https://bugzilla.redhat.com/1150191
Signed-off-by: Tomas Jelinek <tjelinek(a)redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/NonOperationalReason.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDAOTest.java
M backend/manager/modules/dal/src/test/resources/fixtures.xml
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/MonitoringStrategyFactory.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VirtMonitoringStrategy.java
M
backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/MultipleServicesMonitoringStrategyTest.java
M
backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VirtMonitoringStrategyTest.java
M
frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
M
frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
M packaging/dbscripts/vds_sp.sql
14 files changed, 156 insertions(+), 10 deletions(-)
Approvals:
Tomas Jelinek: Verified
Omer Frenkel: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/34653
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb6d41b1921a6caf946cba44a6c92ef86fef6bc8
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5
Gerrit-Owner: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server