Martin Peřina has uploaded a new change for review. Change subject: core: Fix ConfigValues.NormalizedMgmgNetworkEnabled name ......................................................................
core: Fix ConfigValues.NormalizedMgmgNetworkEnabled name Renames ConfigValues attribute NormalizedMgmgNetworkEnabled to NormalizedMgmtNetworkEnabled. Change-Id: I0776f62884e7918e530149296ec136b643bdee18 Bug-Url: https://bugzilla.redhat.com/1112036 Signed-off-by: Martin Perina <[email protected]> --- 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 3 files changed, 9 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/29067/1 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 18b6f00..ebac0ed 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 @@ -159,7 +159,7 @@ * @return <code>true</code> if Management Network normalization is supported for the cluster version. */ public static boolean setupManagementNetwork(Version version) { - return supportedInConfig(ConfigValues.NormalizedMgmgNetworkEnabled, version); + return supportedInConfig(ConfigValues.NormalizedMgmtNetworkEnabled, 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 f228876..c90a3dc 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 @@ -1559,7 +1559,7 @@ @TypeConverterAttribute(Boolean.class) @DefaultValueAttribute("true") - NormalizedMgmgNetworkEnabled, + NormalizedMgmtNetworkEnabled, @TypeConverterAttribute(Boolean.class) @DefaultValueAttribute("true") diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 664832b..13eeebd 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -38,6 +38,9 @@ select fn_db_rename_config_key('GlusterAysncTasksSupport', 'GlusterAsyncTasksSupport', '3.1'); select fn_db_rename_config_key('GlusterAysncTasksSupport', 'GlusterAsyncTasksSupport', '3.2'); select fn_db_rename_config_key('GlusterAysncTasksSupport', 'GlusterAsyncTasksSupport', '3.3'); +select fn_db_rename_config_key('NormalizedMgmgNetworkEnabled', 'NormalizedMgmtNetworkEnabled', '3.0'); +select fn_db_rename_config_key('NormalizedMgmgNetworkEnabled', 'NormalizedMgmtNetworkEnabled', '3.1'); +select fn_db_rename_config_key('NormalizedMgmgNetworkEnabled', 'NormalizedMgmtNetworkEnabled', '3.2'); ------------------------------------------------------------------------------------ -- Add configuration values section @@ -225,9 +228,9 @@ select fn_db_add_config_value('VirtIoScsiEnabled','false','3.0'); select fn_db_add_config_value('VirtIoScsiEnabled','false','3.1'); select fn_db_add_config_value('VirtIoScsiEnabled','false','3.2'); -select fn_db_add_config_value('NormalizedMgmgNetworkEnabled','false','3.0'); -select fn_db_add_config_value('NormalizedMgmgNetworkEnabled','false','3.1'); -select fn_db_add_config_value('NormalizedMgmgNetworkEnabled','false','3.2'); +select fn_db_add_config_value('NormalizedMgmtNetworkEnabled','false','3.0'); +select fn_db_add_config_value('NormalizedMgmtNetworkEnabled','false','3.1'); +select fn_db_add_config_value('NormalizedMgmtNetworkEnabled','false','3.2'); select fn_db_add_config_value('IterationsWithBalloonProblem','3','general'); select fn_db_add_config_value('MomPoliciesOnHostSupported','false','3.0'); select fn_db_add_config_value('MomPoliciesOnHostSupported','false','3.1'); @@ -1076,6 +1079,7 @@ select fn_db_delete_config_value('VdsRecoveryTimeoutInMintues','general'); select fn_db_delete_config_value('UknownTaskPrePollingLapse','general'); select fn_db_delete_config_value('GlusterAysncTasksSupport','3.0,3.1,3.2,3.3'); +select fn_db_delete_config_value('NormalizedMgmgNetworkEnabled','3.0,3.1,3.2'); ------------------------------------------------------------------------------------ -- Split config section -- To view, visit http://gerrit.ovirt.org/29067 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0776f62884e7918e530149296ec136b643bdee18 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
