Eli Mesika has uploaded a new change for review. Change subject: core: fix default network rename ......................................................................
core: fix default network rename Upgrade script 03_06_0850 tried to rename the config option key ManagementNetwork to DefaultManagementNetwork There were 2 problems in that 1) The version given was misspelled : 'genenral', causing the rename to fail 2) The right place for configuration changes is dbscripts/upgrade/pre_upgrade/0000_config.sql This patch fixes both issues Change-Id: I21f964a12ecd4b99ea2aed512f89dc84882d70c7 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1211649 Signed-off-by: emesika <[email protected]> --- M packaging/dbscripts/upgrade/03_06_0850_update_management_network_vdc_option.sql M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql 2 files changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/39885/1 diff --git a/packaging/dbscripts/upgrade/03_06_0850_update_management_network_vdc_option.sql b/packaging/dbscripts/upgrade/03_06_0850_update_management_network_vdc_option.sql index da7780f..b820c8b 100644 --- a/packaging/dbscripts/upgrade/03_06_0850_update_management_network_vdc_option.sql +++ b/packaging/dbscripts/upgrade/03_06_0850_update_management_network_vdc_option.sql @@ -1,2 +1,5 @@ -select fn_db_rename_config_key('ManagementNetwork', 'DefaultManagementNetwork', 'genenral'); +--Commenting call since it uses a wrong version 'genenral' and actually does nothing +--select fn_db_rename_config_key('ManagementNetwork', 'DefaultManagementNetwork', 'genenral'); + +select 3060850; diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 6d94283..af362b4 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -42,6 +42,7 @@ select fn_db_rename_config_key('NormalizedMgmgNetworkEnabled', 'NormalizedMgmtNetworkEnabled', '3.1'); select fn_db_rename_config_key('NormalizedMgmgNetworkEnabled', 'NormalizedMgmtNetworkEnabled', '3.2'); select fn_db_rename_config_key('DefaultMtu', 'DefaultMTU', 'general'); +select fn_db_rename_config_key('ManagementNetwork', 'DefaultManagementNetwork', 'general'); ------------------------------------------------------------------------------------ -- Add configuration values section @@ -379,7 +380,7 @@ select fn_db_add_config_value('LowUtilizationForPowerSave','20','general'); select fn_db_add_config_value('MacPoolRanges','00:1A:4A:16:01:51-00:1A:4A:16:01:e6','general'); select fn_db_add_config_value('ManagedDevicesWhiteList','','general'); -select fn_db_add_config_value('ManagementNetwork','ovirtmgmt','general'); +select fn_db_add_config_value('DefaultManagementNetwork','ovirtmgmt','general'); select fn_db_add_config_value('MaxAuditLogMessageLength','10000','general'); select fn_db_add_config_value('MaxBlockDiskSize','8192','general'); select fn_db_add_config_value('MaxLDAPQueryPartsNumber','100','general'); @@ -1025,6 +1026,7 @@ select fn_db_delete_config_value('SysPrepWindows8Path','general'); select fn_db_delete_config_value('SysPrepWindows8x64Path','general'); select fn_db_delete_config_value('SysPrepWindows2012x64Path','general'); +select fn_db_delete_config_value('ManagementNetwork','general'); ------------------------------------------------------------------------------------ -- Split config section -- The purpose of this section is to treat config option that was once -- To view, visit https://gerrit.ovirt.org/39885 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I21f964a12ecd4b99ea2aed512f89dc84882d70c7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eli Mesika <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
