Ravi Nori has uploaded a new change for review. Change subject: tools: engine-config need to remove all ver 2.2 values ......................................................................
tools: engine-config need to remove all ver 2.2 values Remove deprecated config keys from engine-config EmulatedMachine: rhel5.5.0 version: 2.2 MaxNumOfCpuPerSocket: 16 version: 2.2 MaxNumOfVmCpus: 16 version: 2.2 MaxNumOfVmSockets: 16 version: 2.2 SpiceSecureChannels: smain,sinputs version: 2.2 UserDefinedVMProperties: version: 2.2 EnableMACAntiSpoofingFilterRules: false version: 2.2 Change-Id: I36928233e7022a1daa5fabb89535b91fe78bf186 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=859045 Signed-off-by: Ravi Nori <[email protected]> --- M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql M backend/manager/tools/engine-config/src/main/resources/engine-config.properties 2 files changed, 28 insertions(+), 38 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/9091/1 diff --git a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql index 785214f..84294bb 100644 --- a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -101,10 +101,6 @@ select fn_db_add_config_value('DocsURL','docs','general'); --Handling NetBIOS Domain Name select fn_db_add_config_value('DomainName','example.com','general'); -select fn_db_add_config_value('EmulatedMachine','rhel5.5.0','2.2'); -select fn_db_add_config_value('EmulatedMachine','rhel6.0.0','3.0'); -select fn_db_add_config_value('EmulatedMachine','pc-0.14','3.1'); -select fn_db_add_config_value('EmulatedMachine','pc-0.14','3.2'); -- Host time drift select fn_db_add_config_value('EnableHostTimeDrift','false','general'); --Handling Enable Spice Root Certification Validation @@ -282,18 +278,6 @@ select fn_db_add_config_value('MaxLDAPQueryPartsNumber','100','general'); select fn_db_add_config_value('MaxMacsCountInPool','100000','general'); select fn_db_add_config_value('MaxNumberOfHostsInStoragePool','250','general'); -select fn_db_add_config_value('MaxNumOfCpuPerSocket','16','2.2'); -select fn_db_add_config_value('MaxNumOfCpuPerSocket','16','3.0'); -select fn_db_add_config_value('MaxNumOfCpuPerSocket','16','3.1'); -select fn_db_add_config_value('MaxNumOfCpuPerSocket','16','3.2'); -select fn_db_add_config_value('MaxNumOfVmCpus','16','2.2'); -select fn_db_add_config_value('MaxNumOfVmCpus','64','3.0'); -select fn_db_add_config_value('MaxNumOfVmCpus','64','3.1'); -select fn_db_add_config_value('MaxNumOfVmCpus','64','3.2'); -select fn_db_add_config_value('MaxNumOfVmSockets','16','2.2'); -select fn_db_add_config_value('MaxNumOfVmSockets','16','3.0'); -select fn_db_add_config_value('MaxNumOfVmSockets','16','3.1'); -select fn_db_add_config_value('MaxNumOfVmSockets','16','3.2'); select fn_db_add_config_value('MaxRerunVmOnVdsCount','3','general'); select fn_db_add_config_value('MaxStorageVdsDelayCheckSec','5','general'); select fn_db_add_config_value('MaxStorageVdsTimeoutCheckSec','30','general'); @@ -321,10 +305,6 @@ select fn_db_add_config_value('SupportBridgesReportByVDSM','false','3.0'); select fn_db_add_config_value('SupportBridgesReportByVDSM','false','3.1'); select fn_db_add_config_value('SupportBridgesReportByVDSM','true','3.2'); -select fn_db_add_config_value('EnableMACAntiSpoofingFilterRules','false', '2.2'); -select fn_db_add_config_value('EnableMACAntiSpoofingFilterRules','false', '3.0'); -select fn_db_add_config_value('EnableMACAntiSpoofingFilterRules','false', '3.1'); -select fn_db_add_config_value('EnableMACAntiSpoofingFilterRules','true', '3.2'); select fn_db_add_config_value('MTUOverrideSupported','false','2.2'); select fn_db_add_config_value('MTUOverrideSupported','false','3.0'); select fn_db_add_config_value('MTUOverrideSupported','true','3.1'); @@ -495,10 +475,6 @@ --Handling Truststore URL select fn_db_add_config_value('TruststoreUrl','.truststore','general'); select fn_db_add_config_value('UknownTaskPrePollingLapse','60000','general'); -select fn_db_add_config_value('UserDefinedVMProperties','','2.2'); -select fn_db_add_config_value('UserDefinedVMProperties','','3.0'); -select fn_db_add_config_value('UserDefinedVMProperties','','3.1'); -select fn_db_add_config_value('UserDefinedVMProperties','','3.2'); select fn_db_add_config_value('UserRefreshRate','3600','general'); select fn_db_add_config_value('UserSessionTimeOutInterval','30','general'); select fn_db_add_config_value('UseRtl8139_pv','true','2.2'); @@ -660,6 +636,34 @@ select fn_db_delete_config_value('VdsErrorsFileName','general'); select fn_db_delete_config_value('VM64BitMaxMemorySizeInMB','general'); select fn_db_delete_config_value('LogVdsRegistration','general'); +select fn_db_delete_config_value('EmulatedMachine','2.2'); +select fn_db_delete_config_value('EmulatedMachine','3.0'); +select fn_db_delete_config_value('EmulatedMachine','3.1'); +select fn_db_delete_config_value('EmulatedMachine','3.2'); +select fn_db_delete_config_value('MaxNumOfCpuPerSocket','2.2'); +select fn_db_delete_config_value('MaxNumOfCpuPerSocket','3.0'); +select fn_db_delete_config_value('MaxNumOfCpuPerSocket','3.1'); +select fn_db_delete_config_value('MaxNumOfCpuPerSocket','3.2'); +select fn_db_delete_config_value('MaxNumOfVmCpus','2.2'); +select fn_db_delete_config_value('MaxNumOfVmCpus','3.0'); +select fn_db_delete_config_value('MaxNumOfVmCpus','3.1'); +select fn_db_delete_config_value('MaxNumOfVmCpus','3.2'); +select fn_db_delete_config_value('MaxNumOfVmSockets','2.2'); +select fn_db_delete_config_value('MaxNumOfVmSockets','3.0'); +select fn_db_delete_config_value('MaxNumOfVmSockets','3.1'); +select fn_db_delete_config_value('MaxNumOfVmSockets','3.2'); +select fn_db_delete_config_value('UserDefinedVMProperties','2.2'); +select fn_db_delete_config_value('UserDefinedVMProperties','3.0'); +select fn_db_delete_config_value('UserDefinedVMProperties','3.1'); +select fn_db_delete_config_value('UserDefinedVMProperties','3.2'); +select fn_db_delete_config_value('EnableMACAntiSpoofingFilterRules', '2.2'); +select fn_db_delete_config_value('EnableMACAntiSpoofingFilterRules', '3.0'); +select fn_db_delete_config_value('EnableMACAntiSpoofingFilterRules', '3.1'); +select fn_db_delete_config_value('EnableMACAntiSpoofingFilterRules', '3.2'); +select fn_db_delete_config_value('SpiceSecureChannels', '2.2'); +select fn_db_delete_config_value('SpiceSecureChannels', '3.0'); +select fn_db_delete_config_value('SpiceSecureChannels', '3.1'); +select fn_db_delete_config_value('SpiceSecureChannels', '3.2'); ------------------------------------------------------------------------------------ -- Split config section -- The purpose of this section is to treat config option that was once @@ -669,7 +673,6 @@ -- cluster level with the original value if exists, or the input old value -- and from the update version and beyond, the input value. ------------------------------------------------------------------------------------ -select fn_db_split_config_value('SpiceSecureChannels','smain,sinputs','smain,sinputs,scursor,splayback,srecord,sdisplay,susbredir,ssmartcard', '3.1'); ------------------------------------------------------------------------------------ -- Simple direct updates section diff --git a/backend/manager/tools/engine-config/src/main/resources/engine-config.properties b/backend/manager/tools/engine-config/src/main/resources/engine-config.properties index 68b4ad2..22213f1 100644 --- a/backend/manager/tools/engine-config/src/main/resources/engine-config.properties +++ b/backend/manager/tools/engine-config/src/main/resources/engine-config.properties @@ -22,7 +22,6 @@ CpuOverCommitDurationMinutes.type=Integer DisableFenceAtStartupInSec.description="Disable Fence Operations At oVirt Startup In Seconds" DisableFenceAtStartupInSec.type=Integer -EmulatedMachine.description="Supported machine types" WANDisableEffects.description="Disabled WAN Effects value to send to the SPICE console" WANDisableEffects.validValues=animation,wallpaper,font-smooth,all WANDisableEffects.type=StringMultiple @@ -62,12 +61,6 @@ MaxMacsCountInPool.type=Integer MaxNumberOfHostsInStoragePool.description="Max number of hosts in Storage Pool" MaxNumberOfHostsInStoragePool.type=Integer -MaxNumOfCpuPerSocket.description="Max Number of CPU per socket" -MaxNumOfCpuPerSocket.type=Integer -MaxNumOfVmCpus.description="Total Numbers of Virtual Machine CPUs" -MaxNumOfVmCpus.type=Integer -MaxNumOfVmSockets.description="Max Number of Socket per Virtual Machine" -MaxNumOfVmSockets.type=Integer MaxRerunVmOnVdsCount.description="Max Virtual Machine Rerun Attempts on a Host" MaxRerunVmOnVdsCount.type=Integer MaxStorageVdsDelayCheckSec.description="Max delay for check of domain in seconds" @@ -113,9 +106,6 @@ ServerRebootTimeout.description="Host Reboot Timeout (in seconds)" ServerRebootTimeout.type=Integer SpiceReleaseCursorKeys.description="Keyboard keys combination that causes the mouse cursor to be released from its grab on SPICE" -SpiceSecureChannels.description="SPICE Secure Channels" -SpiceSecureChannels.type=StringMultiple -SpiceSecureChannels.validValues=smain,sinputs,scursor,splayback,srecord,sdisplay,ssmartcard,susbredir SpiceToggleFullScreenKeys.description="Keyboard keys combination that toggles the full-screen state of SPICE client window" SpiceUsbAutoShare.description="Enable USB devices sharing by default in SPICE" SpiceUsbAutoShare.validValues=true,false @@ -149,7 +139,6 @@ TimeoutToResetVdsInSeconds.type=Integer TimeToReduceFailedRunOnVdsInMinutes.description="Time to Reduce Failed Run on Host (in minutes)" TimeToReduceFailedRunOnVdsInMinutes.type=Integer -UserDefinedVMProperties.description="User defined VM properties" UserRefreshRate.description="Refresh Rate of Users Data from Active Directory (in seconds)" UserRefreshRate.type=Integer UtilizationThresholdInPercent.description="The Utilization Threshold (in percent)" @@ -220,8 +209,6 @@ NetworkConnectivityCheckTimeoutInSeconds.validValues=10..160 AllowClusterWithVirtGlusterEnabled.description="Allows to create a Cluster with both Virt and Gluster services enabled" AllowClusterWithVirtGlusterEnabled.validValues=true,false -EnableMACAntiSpoofingFilterRules.description="Indicates if Network Filtering should be enabled or not." -EnableMACAntiSpoofingFilterRules.validValues=true,false EnableHostTimeDrift.description="Indecates if Host time-drift validation is enabled" EnableHostTimeDrift.validValues=true,false EngineMode.description="Engine working mode" -- To view, visit http://gerrit.ovirt.org/9091 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I36928233e7022a1daa5fabb89535b91fe78bf186 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
