Mike Kolesnik has uploaded a new change for review. Change subject: engine: Block setup of mgmt net for older clusters ......................................................................
engine: Block setup of mgmt net for older clusters The old VDSMs don't work well when running setup networks right after install (3.1) or they don't have setup networks verb (3.0) so added FeatureSupported for this. Old cluster versions will have hosts installed the old way (using the ovirt-host-deploy method). Change-Id: I690063e7d3ae72b4791894dabc59a7b3a6cd6a44 Bug-Url: https://bugzilla.redhat.com/985027 Signed-off-by: Mike Kolesnik <mkole...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql 5 files changed, 19 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/17069/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java index f45d36c..3c146ad 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java @@ -5,10 +5,9 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.exception.ExceptionUtils; import org.ovirt.engine.core.bll.network.NetworkConfigurator; -import org.ovirt.engine.core.bll.utils.VersionSupport; import org.ovirt.engine.core.common.AuditLogType; +import org.ovirt.engine.core.common.FeatureSupported; import org.ovirt.engine.core.common.action.InstallVdsParameters; -import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.OpenstackNetworkProviderProperties; import org.ovirt.engine.core.common.businessentities.Provider; import org.ovirt.engine.core.common.businessentities.ProviderType; @@ -113,8 +112,7 @@ installer = new VdsDeploy(getVds()); installer.setCorrelationId(getCorrelationId()); boolean configureNetworkUsingHostDeploy = - !VersionSupport.isActionSupported(VdcActionType.SetupNetworks, - getVds().getVdsGroupCompatibilityVersion()); + !FeatureSupported.setupManagementNetwork(getVds().getVdsGroupCompatibilityVersion()); installer.setReboot(parameters.isRebootAfterInstallation() && configureNetworkUsingHostDeploy); if (configureNetworkUsingHostDeploy) { installer.setManagementNetwork(NetworkUtils.getEngineNetwork()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java index 6276e88..ca3bb5d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java @@ -9,8 +9,8 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.Backend; import org.ovirt.engine.core.bll.interfaces.BackendInternal; -import org.ovirt.engine.core.bll.utils.VersionSupport; import org.ovirt.engine.core.common.AuditLogType; +import org.ovirt.engine.core.common.FeatureSupported; import org.ovirt.engine.core.common.action.SetupNetworksParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; @@ -54,8 +54,7 @@ if (host == null || managementNetwork.equals(host.getActiveNic()) - || !VersionSupport.isActionSupported(VdcActionType.SetupNetworks, - host.getVdsGroupCompatibilityVersion())) { + || !FeatureSupported.setupManagementNetwork(host.getVdsGroupCompatibilityVersion())) { return; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java index 648eae0..ae8c2a3 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java @@ -131,4 +131,13 @@ public static boolean virtIoScsi(Version version) { return supportedInConfig(ConfigValues.VirtIoScsiEnabled, version); } + + /** + * @param version + * Compatibility version to check for. + * @return <code>true</code> iff Management Network normalization is supported for the cluster version. + */ + public static boolean setupManagementNetwork(Version version) { + return supportedInConfig(ConfigValues.NormalizedMgmgNetworkEnabled, version); + } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java index 1a686d0..e3298f9 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java @@ -1445,6 +1445,10 @@ @DefaultValueAttribute("0.2") AverageToBurstRatio(521), + @TypeConverterAttribute(Boolean.class) + @DefaultValueAttribute("true") + NormalizedMgmgNetworkEnabled(522), + Invalid(65535); private int intValue; diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index a0e9d74..c8b692c 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -194,6 +194,8 @@ select fn_db_add_config_value('VirtIoScsiEnabled','false','3.2'); select fn_db_add_config_value('VirtIoScsiEnabled','true','3.3'); select fn_db_add_config_value('VirtIoScsiUnsupportedOsList','WindowsXP,RHEL5,RHEL5x64,RHEL4,RHEL4x64,RHEL3,RHEL3x64','general'); +select fn_db_add_config_value('NormalizedMgmgNetworkEnabled','false','3.0'); +select fn_db_add_config_value('NormalizedMgmgNetworkEnabled','false','3.1'); -- by default use no proxy select fn_db_add_config_value('SpiceProxyDefault','','general'); -- To view, visit http://gerrit.ovirt.org/17069 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I690063e7d3ae72b4791894dabc59a7b3a6cd6a44 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <mkole...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
