Gilad Chaplik has uploaded a new change for review. Change subject: db: add missing vdc_option for 3.3 ......................................................................
db: add missing vdc_option for 3.3 also removed a single 2.2 property that left behind (SupportForceExtendVG) Change-Id: I12406fd340b778cb2160ec063d68c4f3c5a42518 Bug-Url: https://bugzilla.redhat.com/924201 Signed-off-by: Gilad Chaplik <[email protected]> --- M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql 1 file changed, 28 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/48/13748/1 diff --git a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql index 42500eb..b55c6b3 100644 --- a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -33,6 +33,7 @@ select fn_db_add_config_value('CpuPinningEnabled','false','3.0'); select fn_db_add_config_value('CpuPinningEnabled','true','3.1'); select fn_db_add_config_value('CpuPinningEnabled','true','3.2'); +select fn_db_add_config_value('CpuPinningEnabled','true','3.3'); select fn_db_add_config_value('AdminDomain','internal','general'); select fn_db_add_config_value('AdminPassword','','general'); select fn_db_add_config_value('AdminUser','admin','general'); @@ -88,16 +89,19 @@ select fn_db_add_config_value('DesktopAudioDeviceType','WindowsXP,ac97,RHEL4,ac97,RHEL3,ac97,Windows2003x64,ac97,RHEL4x64,ac97,RHEL3x64,ac97,OtherLinux,ac97,Other,ac97,default,ich6','3.0'); select fn_db_add_config_value('DesktopAudioDeviceType','WindowsXP,ac97,RHEL4,ac97,RHEL3,ac97,Windows2003x64,ac97,RHEL4x64,ac97,RHEL3x64,ac97,OtherLinux,ac97,Other,ac97,default,ich6','3.1'); select fn_db_add_config_value('DesktopAudioDeviceType','WindowsXP,ac97,RHEL4,ac97,RHEL3,ac97,Windows2003x64,ac97,RHEL4x64,ac97,RHEL3x64,ac97,OtherLinux,ac97,Other,ac97,default,ich6','3.2'); +select fn_db_add_config_value('DesktopAudioDeviceType','WindowsXP,ac97,RHEL4,ac97,RHEL3,ac97,Windows2003x64,ac97,RHEL4x64,ac97,RHEL3x64,ac97,OtherLinux,ac97,Other,ac97,default,ich6','3.3'); select fn_db_add_config_value('DisableFenceAtStartupInSec','300','general'); select fn_db_add_config_value('DirectLUNDiskEnabled','false','3.0'); select fn_db_add_config_value('DirectLUNDiskEnabled','true','3.1'); select fn_db_add_config_value('DirectLUNDiskEnabled','true','3.2'); +select fn_db_add_config_value('DirectLUNDiskEnabled','true','3.3'); 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','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'); +select fn_db_add_config_value('EmulatedMachine','pc-0.14','3.3'); -- Host time drift select fn_db_add_config_value('EnableHostTimeDrift','false','general'); --Handling Enable Spice Root Certification Validation @@ -123,6 +127,7 @@ select fn_db_add_config_value('FilteringLUNsEnabled','true','3.0'); select fn_db_add_config_value('FilteringLUNsEnabled','false','3.1'); select fn_db_add_config_value('FilteringLUNsEnabled','false','3.2'); +select fn_db_add_config_value('FilteringLUNsEnabled','false','3.3'); select fn_db_add_config_value('FindFenceProxyDelayBetweenRetriesInSec','30','general'); select fn_db_add_config_value('FindFenceProxyRetries','3','general'); select fn_db_add_config_value('FreeSpaceCriticalLowInGB','5','general'); @@ -134,18 +139,22 @@ select fn_db_add_config_value('HardwareInfoEnabled','false','3.0'); select fn_db_add_config_value('HardwareInfoEnabled','false','3.1'); select fn_db_add_config_value('HardwareInfoEnabled','true','3.2'); +select fn_db_add_config_value('HardwareInfoEnabled','true','3.3'); select fn_db_add_config_value('HighUtilizationForEvenlyDistribute','75','general'); select fn_db_add_config_value('HighUtilizationForPowerSave','75','general'); select fn_db_add_config_value('HostTimeDriftInSec','300','general'); select fn_db_add_config_value('HotPlugEnabled','false','3.0'); select fn_db_add_config_value('HotPlugEnabled','true','3.1'); select fn_db_add_config_value('HotPlugEnabled','true','3.2'); +select fn_db_add_config_value('HotPlugEnabled','true','3.3'); select fn_db_add_config_value('MigrationSupportForNativeUsb','false','3.0'); select fn_db_add_config_value('MigrationSupportForNativeUsb','false','3.1'); select fn_db_add_config_value('MigrationSupportForNativeUsb','true','3.2'); +select fn_db_add_config_value('MigrationSupportForNativeUsb','true','3.3'); select fn_db_add_config_value('NetworkLinkingSupported','false','3.0'); select fn_db_add_config_value('NetworkLinkingSupported','false','3.1'); select fn_db_add_config_value('NetworkLinkingSupported','true','3.2'); +select fn_db_add_config_value('NetworkLinkingSupported','true','3.3'); select fn_db_add_config_value('DisconnectPoolOnReconstruct','0,2','general'); select fn_db_add_config_value('HotPlugUnsupportedOsList','','general'); select fn_db_add_config_value('InitStorageSparseSizeInGB','1','general'); @@ -257,6 +266,7 @@ select fn_db_add_config_value('LiveSnapshotEnabled','false','3.0'); select fn_db_add_config_value('LiveSnapshotEnabled','true','3.1'); select fn_db_add_config_value('LiveSnapshotEnabled','true','3.2'); +select fn_db_add_config_value('LiveSnapshotEnabled','true','3.3'); select fn_db_add_config_value('LocalAdminPassword','123456','general'); --Handling Enable lock policy for Storage Pool Manager on activation select fn_db_add_config_value('LockPolicy','ON','general'); @@ -276,12 +286,15 @@ 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('MaxNumOfCpuPerSocket','16','3.3'); select fn_db_add_config_value('MaxNumOfVmCpus','64','3.0'); select fn_db_add_config_value('MaxNumOfVmCpus','160','3.1'); select fn_db_add_config_value('MaxNumOfVmCpus','160','3.2'); +select fn_db_add_config_value('MaxNumOfVmCpus','160','3.3'); 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('MaxNumOfVmSockets','16','3.3'); 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'); @@ -295,10 +308,12 @@ select fn_db_add_config_value('NativeUSBEnabled','false','3.0'); select fn_db_add_config_value('NativeUSBEnabled','true','3.1'); select fn_db_add_config_value('NativeUSBEnabled','true','3.2'); +select fn_db_add_config_value('NativeUSBEnabled','true','3.3'); select fn_db_add_config_value('NicDHCPDelayGraceInMS','60','general'); select fn_db_add_config_value('NonVmNetworkSupported','false','3.0'); select fn_db_add_config_value('NonVmNetworkSupported','true','3.1'); select fn_db_add_config_value('NonVmNetworkSupported','true','3.2'); +select fn_db_add_config_value('NonVmNetworkSupported','true','3.3'); select fn_db_add_config_value('NumberOfFailedRunsOnVds','3','general'); select fn_db_add_config_value('NumberOfUSBSlots','4','general'); select fn_db_add_config_value('NumberOfVmsForTopSizeVms','10','general'); @@ -306,9 +321,11 @@ 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('SupportBridgesReportByVDSM','true','3.3'); 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('EnableMACAntiSpoofingFilterRules','true', '3.3'); select fn_db_add_config_value('GlusterFsStorageEnabled','false','3.0'); select fn_db_add_config_value('GlusterFsStorageEnabled','false','3.1'); select fn_db_add_config_value('GlusterFsStorageEnabled','false','3.2'); @@ -316,6 +333,7 @@ select fn_db_add_config_value('MTUOverrideSupported','false','3.0'); select fn_db_add_config_value('MTUOverrideSupported','true','3.1'); select fn_db_add_config_value('MTUOverrideSupported','true','3.2'); +select fn_db_add_config_value('MTUOverrideSupported','true','3.3'); --Handling Organization Name select fn_db_add_config_value('OrganizationName','oVirt','general'); select fn_db_add_config_value('OriginType','OVIRT','general'); @@ -332,6 +350,7 @@ select fn_db_add_config_value('PosixStorageEnabled','false','3.0'); select fn_db_add_config_value('PosixStorageEnabled','true','3.1'); select fn_db_add_config_value('PosixStorageEnabled','true','3.2'); +select fn_db_add_config_value('PosixStorageEnabled','true','3.3'); select fn_db_add_config_value('PostgresI18NPrefix','','general'); select fn_db_add_config_value('PostgresLikeSyntax','ILIKE','general'); select fn_db_add_config_value('PostgresPagingSyntax',E' OFFSET (%1$s -1) LIMIT %2$s','general'); @@ -340,6 +359,7 @@ select fn_db_add_config_value('PredefinedVMProperties','sap_agent=^(true|false)$;sndbuf=^[0-9]+$;vhost=^(([a-zA-Z0-9_]*):(true|false))(,(([a-zA-Z0-9_]*):(true|false)))*$;viodiskcache=^(none|writeback|writethrough)$','3.0'); select fn_db_add_config_value('PredefinedVMProperties','sap_agent=^(true|false)$;sndbuf=^[0-9]+$;vhost=^(([a-zA-Z0-9_]*):(true|false))(,(([a-zA-Z0-9_]*):(true|false)))*$;viodiskcache=^(none|writeback|writethrough)$','3.1'); select fn_db_add_config_value('PredefinedVMProperties','sap_agent=^(true|false)$;sndbuf=^[0-9]+$;vhost=^(([a-zA-Z0-9_]*):(true|false))(,(([a-zA-Z0-9_]*):(true|false)))*$;viodiskcache=^(none|writeback|writethrough)$','3.2'); +select fn_db_add_config_value('PredefinedVMProperties','sap_agent=^(true|false)$;sndbuf=^[0-9]+$;vhost=^(([a-zA-Z0-9_]*):(true|false))(,(([a-zA-Z0-9_]*):(true|false)))*$;viodiskcache=^(none|writeback|writethrough)$','3.3'); select fn_db_add_config_value('ProductKey2003','','general'); select fn_db_add_config_value('ProductKey2003x64','','general'); select fn_db_add_config_value('ProductKey2008','','general'); @@ -368,15 +388,18 @@ select fn_db_add_config_value('SendVmTicketUID','false','3.0'); select fn_db_add_config_value('SendVmTicketUID','true','3.1'); select fn_db_add_config_value('SendVmTicketUID','true','3.2'); +select fn_db_add_config_value('SendVmTicketUID','true','3.3'); select fn_db_add_config_value('ServerCPUList','3:Intel Conroe Family:vmx,nx,model_Conroe:Conroe; 4:Intel Penryn Family:vmx,nx,model_Penryn:Penryn; 5:Intel Nehalem Family:vmx,nx,model_Nehalem:Nehalem; 6:Intel Westmere Family:aes,vmx,nx,model_Westmere:Westmere; 2:AMD Opteron G1:svm,nx,model_Opteron_G1:Opteron_G1; 3:AMD Opteron G2:svm,nx,model_Opteron_G2:Opteron_G2; 4:AMD Opteron G3:svm,nx,model_Opteron_G3:Opteron_G3;','3.0'); select fn_db_add_config_value('ServerCPUList','3:Intel Conroe Family:vmx,nx,model_Conroe:Conroe; 4:Intel Penryn Family:vmx,nx,model_Penryn:Penryn; 5:Intel Nehalem Family:vmx,nx,model_Nehalem:Nehalem; 6:Intel Westmere Family:aes,vmx,nx,model_Westmere:Westmere; 2:AMD Opteron G1:svm,nx,model_Opteron_G1:Opteron_G1; 3:AMD Opteron G2:svm,nx,model_Opteron_G2:Opteron_G2; 4:AMD Opteron G3:svm,nx,model_Opteron_G3:Opteron_G3;','3.1'); select fn_db_add_config_value('ServerCPUList','3:Intel Conroe Family:vmx,nx,model_Conroe:Conroe; 4:Intel Penryn Family:vmx,nx,model_Penryn:Penryn; 5:Intel Nehalem Family:vmx,nx,model_Nehalem:Nehalem; 6:Intel Westmere Family:aes,vmx,nx,model_Westmere:Westmere; 7:Intel SandyBridge Family:vmx,nx,model_SandyBridge:SandyBridge; 8:Intel Haswell:vmx,nx,model_Haswell:Haswell; 2:AMD Opteron G1:svm,nx,model_Opteron_G1:Opteron_G1; 3:AMD Opteron G2:svm,nx,model_Opteron_G2:Opteron_G2; 4:AMD Opteron G3:svm,nx,model_Opteron_G3:Opteron_G3; 5:AMD Opteron G4:svm,nx,model_Opteron_G4:Opteron_G4; 6:AMD Opteron G5:smx,nx,model_Opteron_G5:Opteron_G5;','3.2'); +select fn_db_add_config_value('ServerCPUList','3:Intel Conroe Family:vmx,nx,model_Conroe:Conroe; 4:Intel Penryn Family:vmx,nx,model_Penryn:Penryn; 5:Intel Nehalem Family:vmx,nx,model_Nehalem:Nehalem; 6:Intel Westmere Family:aes,vmx,nx,model_Westmere:Westmere; 7:Intel SandyBridge Family:vmx,nx,model_SandyBridge:SandyBridge; 8:Intel Haswell:vmx,nx,model_Haswell:Haswell; 2:AMD Opteron G1:svm,nx,model_Opteron_G1:Opteron_G1; 3:AMD Opteron G2:svm,nx,model_Opteron_G2:Opteron_G2; 4:AMD Opteron G3:svm,nx,model_Opteron_G3:Opteron_G3; 5:AMD Opteron G4:svm,nx,model_Opteron_G4:Opteron_G4; 6:AMD Opteron G5:smx,nx,model_Opteron_G5:Opteron_G5;','3.3'); select fn_db_add_config_value('ServerRebootTimeout','300','general'); select fn_db_add_config_value('SetupNetworksPollingTimeout','3','general'); -- Add shareable disk property in vdc_options to support only 3.1 version. select fn_db_add_config_value('ShareableDiskEnabled','false','3.0'); select fn_db_add_config_value('ShareableDiskEnabled','true','3.1'); select fn_db_add_config_value('ShareableDiskEnabled','true','3.2'); +select fn_db_add_config_value('ShareableDiskEnabled','true','3.3'); select fn_db_add_config_value('SignCertTimeoutInSeconds','30','general'); --Handling Script name for signing select fn_db_add_config_value('SignScriptName','SignReq.sh','general'); @@ -409,10 +432,11 @@ select fn_db_add_config_value('SupportForceCreateVG','false','3.0'); select fn_db_add_config_value('SupportForceCreateVG','true','3.1'); select fn_db_add_config_value('SupportForceCreateVG','true','3.2'); -select fn_db_add_config_value('SupportForceExtendVG','false','2.2'); +select fn_db_add_config_value('SupportForceCreateVG','true','3.3'); select fn_db_add_config_value('SupportForceExtendVG','false','3.0'); select fn_db_add_config_value('SupportForceExtendVG','false','3.1'); select fn_db_add_config_value('SupportForceExtendVG','true','3.2'); +select fn_db_add_config_value('SupportForceExtendVG','true','3.3'); select fn_db_add_config_value('SysPrep2K3Path','/etc/ovirt-engine/sysprep/sysprep.2k3','general'); select fn_db_add_config_value('SysPrep2K8Path','/etc/ovirt-engine/sysprep/sysprep.2k8x86','general'); select fn_db_add_config_value('SysPrep2K8R2Path','/etc/ovirt-engine/sysprep/sysprep.2k8','general'); @@ -436,6 +460,7 @@ 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('UserDefinedVMProperties','','3.3'); select fn_db_add_config_value('UserRefreshRate','3600','general'); select fn_db_add_config_value('UserSessionTimeOutInterval','30','general'); --Handling Use Secure Connection with Hosts @@ -454,6 +479,7 @@ select fn_db_add_config_value('VdsFenceType','alom,apc,bladecenter,drac5,eps,ilo,ilo3,ipmilan,rsa,rsb,wti,cisco_ucs','3.0'); select fn_db_add_config_value('VdsFenceType','alom,apc,bladecenter,drac5,eps,ilo,ilo3,ipmilan,rsa,rsb,wti,cisco_ucs','3.1'); select fn_db_add_config_value('VdsFenceType','apc,apc_snmp,bladecenter,cisco_ucs,drac5,eps,ilo,ilo2,ilo3,ilo4,ipmilan,rsa,rsb,wti','3.2'); +select fn_db_add_config_value('VdsFenceType','apc,apc_snmp,bladecenter,cisco_ucs,drac5,eps,ilo,ilo2,ilo3,ilo4,ipmilan,rsa,rsb,wti','3.3'); select fn_db_add_config_value('VdsLoadBalancingeIntervalInMinutes','1','general'); select fn_db_add_config_value('VdsLocalDisksCriticallyLowFreeSpace','100','general'); select fn_db_add_config_value('VdsLocalDisksLowFreeSpace','500','general'); @@ -468,6 +494,7 @@ select fn_db_add_config_value('VM64BitMaxMemorySizeInMB','524288','3.0'); select fn_db_add_config_value('VM64BitMaxMemorySizeInMB','524288','3.1'); select fn_db_add_config_value('VM64BitMaxMemorySizeInMB','524288','3.2'); +select fn_db_add_config_value('VM64BitMaxMemorySizeInMB','524288','3.3'); select fn_db_add_config_value('VmGracefulShutdownMessage','System Administrator has initiated shutdown of this Virtual Machine. Virtual Machine is shutting down.','general'); select fn_db_add_config_value('VmGracefulShutdownTimeout','30','general'); select fn_db_add_config_value('VMMinMemorySizeInMB','256','general'); -- To view, visit http://gerrit.ovirt.org/13748 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I12406fd340b778cb2160ec063d68c4f3c5a42518 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
