Tomas Jelinek has uploaded a new change for review. Change subject: core: added event log when mixing RHLE 6 and 7 in one cluster ......................................................................
core: added event log when mixing RHLE 6 and 7 in one cluster It was already disabled to mix this two RHELs, but there was not added a specific message in the event log. This patch adds it, an example: "Not possible to mix RHEL 6.x and 7.x hosts in one cluster. Tried adding RHEL - 6Server - 6.5.0.1.el6 host to a cluster with RHEL - 7Server - 7.5.0.1.el7 hosts." Change-Id: Ia8e58e10f181b6742b88b464739ed39610ac69de Bug-Url: https://bugzilla.redhat.com/1167827 Signed-off-by: Tomas Jelinek <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetNonOperationalVdsCommand.java M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/38/35638/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetNonOperationalVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetNonOperationalVdsCommand.java index 46c0b40..b20cdcf 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetNonOperationalVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetNonOperationalVdsCommand.java @@ -139,6 +139,8 @@ return AuditLogType.EMULATED_MACHINES_INCOMPATIBLE_WITH_CLUSTER; case RNG_SOURCES_INCOMPATIBLE_WITH_CLUSTER: return AuditLogType.RNG_SOURCES_INCOMPATIBLE_WITH_CLUSTER; + case MIXING_RHEL_VERSIONS_IN_CLUSTER: + return AuditLogType.MIXING_RHEL_VERSIONS_IN_CLUSTER; case UNTRUSTED: return AuditLogType.VDS_UNTRUSTED; default: diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties index c7aa292..b9c64dd 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -688,7 +688,7 @@ ADD_VM_FROM_SNAPSHOT_INVALID_INTERFACES=While adding vm ${EntityName} from snapshot, the Network/s ${Networks} were found to be Non-VM Networks or do not exist in Cluster. Network Name was not set in the Interface/s ${Interfaces}. VDS_SET_NON_OPERATIONAL_VM_NETWORK_IS_BRIDGELESS=Host ${VdsName} does not comply with the cluster ${VdsGroupName} networks, the following VM networks are non-VM networks: '${Networks}' EMULATED_MACHINES_INCOMPATIBLE_WITH_CLUSTER=Host ${VdsName} does not comply with the cluster ${VdsGroupName} emulated machines. The Hosts emulated machines are ${hostSupportedEmulatedMachines} and the cluster is ${clusterEmulatedMachines}} -MIXING_RHEL_VERSIONS_IN_CLUSTER=It is not possible to mix RHEL 6x with RHEL 7x in one cluster. Host ${VdsName} has version ${addingRhel} while there are hosts with version ${previousRhel}. +MIXING_RHEL_VERSIONS_IN_CLUSTER=Not possible to mix RHEL 6.x and 7.x hosts in one cluster. Tried adding ${addingRhel} host to a cluster with ${previousRhel} hosts. RNG_SOURCES_INCOMPATIBLE_WITH_CLUSTER=Host ${VdsName} does not comply with the cluster ${VdsGroupName} Random Number Generator sources. The Hosts supported sources are: ${hostSupportedRngSources}; and the cluster requirements are: ${clusterRequiredRngSources}. # NUMA Messages NUMA_ADD_VM_NUMA_NODE_SUCCESS=Add VM NUMA node successfully. -- To view, visit http://gerrit.ovirt.org/35638 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia8e58e10f181b6742b88b464739ed39610ac69de Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Tomas Jelinek <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
