Mike Kolesnik has uploaded a new change for review.
Change subject: core: Updated to version 3.2
......................................................................
core: Updated to version 3.2
The 3.2 compatibility version is needed to support bridgeless networks
in oVirt, so updated the version to 3.2 and added necessary keys to
allow data-centers & clusters in this version.
Change-Id: Ic4ed674435fbfa12dcc9e280e32145270da0278a
Signed-off-by: Mike Kolesnik <mkole...@redhat.com>
---
M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
1 file changed, 31 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/7169/1
diff --git a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
index 465acb3..cccc981 100644
--- a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
+++ b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
@@ -26,6 +26,7 @@
select fn_db_add_config_value('CpuPinningEnabled','false','2.2');
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('AdminDomain','internal','general');
select fn_db_add_config_value('AdminPassword','','general');
select fn_db_add_config_value('AdminUser','admin','general');
@@ -35,6 +36,7 @@
select fn_db_add_config_value('AdvancedNFSOptionsEnabled','false','2.2');
select fn_db_add_config_value('AdvancedNFSOptionsEnabled','false','3.0');
select fn_db_add_config_value('AdvancedNFSOptionsEnabled','true','3.1');
+select fn_db_add_config_value('AdvancedNFSOptionsEnabled','true','3.2');
select fn_db_add_config_value('AgentAppName','RHEV-Agent','general');
select fn_db_add_config_value('AllowDuplicateMacAddresses','false','general');
select fn_db_add_config_value('ApplicationMode','255','general');
@@ -88,17 +90,20 @@
select fn_db_add_config_value('DesktopAudioDeviceType','default,ac97','2.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.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('DisableFenceAtStartupInSec','300','general');
select
fn_db_add_config_value('DiskConfigurationList','System,Sparse,COW,true;Data,Preallocated,RAW,false;Shared,Preallocated,RAW,false;Swap,Preallocated,RAW,false;Temp,Sparse,COW,false','general');
select fn_db_add_config_value('DirectLUNDiskEnabled','false','2.2');
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('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');
--Handling Enable Spice Root Certification Validation
select
fn_db_add_config_value('EnableSpiceRootCertificateValidation','true','general');
select fn_db_add_config_value('EnableSwapCheck','true','general');
@@ -124,6 +129,7 @@
select fn_db_add_config_value('FilteringLUNsEnabled','true','2.2');
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('FindFenceProxyDelayBetweenRetriesInSec','30','general');
select fn_db_add_config_value('FindFenceProxyRetries','3','general');
select fn_db_add_config_value('FreeSpaceCriticalLowInGB','5','general');
@@ -134,6 +140,7 @@
select fn_db_add_config_value('HotPlugEnabled','false','2.2');
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('DisconnectPoolOnReconstruct','0,2','general');
select fn_db_add_config_value('HotPlugUnsupportedOsList','','general');
select fn_db_add_config_value('InitStorageSparseSizeInGB','1','general');
@@ -187,13 +194,16 @@
select fn_db_add_config_value('LimitNumberOfNetworkInterfaces','true','2.2');
select fn_db_add_config_value('LimitNumberOfNetworkInterfaces','false','3.0');
select fn_db_add_config_value('LimitNumberOfNetworkInterfaces','false','3.1');
+select fn_db_add_config_value('LimitNumberOfNetworkInterfaces','false','3.2');
select fn_db_add_config_value('LiveSnapshotEnabled','false','2.2');
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('LocalAdminPassword','123456','general');
select fn_db_add_config_value('LocalStorageEnabled','false','2.2');
select fn_db_add_config_value('LocalStorageEnabled','true','3.0');
select fn_db_add_config_value('LocalStorageEnabled','true','3.1');
+select fn_db_add_config_value('LocalStorageEnabled','true','3.2');
--Handling Enable lock policy for Storage Pool Manager on activation
select fn_db_add_config_value('LockPolicy','ON','general');
select fn_db_add_config_value('LockRenewalIntervalSec','5','general');
@@ -214,12 +224,15 @@
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');
@@ -233,10 +246,12 @@
select fn_db_add_config_value('NativeUSBEnabled','false','2.2');
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('NicDHCPDelayGraceInMS','60','general');
select fn_db_add_config_value('NonVmNetworkSupported','false','2.2');
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('NumberOfFailedRunsOnVds','3','general');
select fn_db_add_config_value('NumberOfUSBSlots','4','general');
select fn_db_add_config_value('NumberOfVmsForTopSizeVms','10','general');
@@ -259,6 +274,7 @@
select fn_db_add_config_value('PosixStorageEnabled','false','2.2');
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('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');
@@ -296,6 +312,7 @@
select fn_db_add_config_value('PredefinedVMProperties','','2.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.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('ProductKey2003','','general');
select fn_db_add_config_value('ProductKey2003x64','','general');
select fn_db_add_config_value('ProductKey2008','','general');
@@ -329,15 +346,18 @@
select fn_db_add_config_value('SendVmTicketUID','false','2.2');
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('ServerCPUList','2:Intel Xeon w/o
XD/NX:vmx,sse2:qemu64,-nx,+sse2; 3:Intel Xeon:vmx,sse2,nx:qemu64,+sse2; 4:Intel
Conroe Family:vmx,sse2,nx,cx16,ssse3:qemu64,+sse2,+cx16,+ssse3; 5:Intel Penryn
Family:vmx,sse2,nx,cx16,ssse3,sse4_1:qemu64,+sse2,+cx16,+ssse3,+sse4.1; 6:Intel
Nehalem
Family:vmx,sse2,nx,cx16,ssse3,sse4_1,sse4_2,popcnt:qemu64,+sse2,+cx16,+ssse3,+sse4.1,+sse4.2,+popcnt;
2:AMD Opteron G1 w/o NX:svm,sse2:qemu64,-nx,+sse2; 3:AMD Opteron
G1:svm,sse2,nx:qemu64,+sse2; 4:AMD Opteron
G2:svm,sse2,nx,cx16:qemu64,+sse2,+cx16; 5:AMD Opteron
G3:svm,sse2,nx,cx16,sse4a,misalignsse,popcnt,abm:qemu64,+sse2,+cx16,+sse4a,+misalignsse,+popcnt,+abm;','2.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; 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; 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;','3.2');
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','2.2');
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('SignCertTimeoutInSeconds','30','general');
select
fn_db_add_config_value('SignLockFile','/var/lock/engine/.openssl.exclusivelock','general');
--Handling Script name for signing
@@ -369,20 +389,25 @@
select fn_db_add_config_value('SupportCustomProperties','false','2.2');
select fn_db_add_config_value('SupportCustomProperties','true','3.0');
select fn_db_add_config_value('SupportCustomProperties','true','3.1');
+select fn_db_add_config_value('SupportCustomProperties','true','3.2');
select fn_db_add_config_value('SupportedClusterLevels','2.2,3.0','general');
select fn_db_add_config_value('SupportedStorageFormats','0','2.2');
select fn_db_add_config_value('SupportedStorageFormats','0,2','3.0');
select fn_db_add_config_value('SupportedStorageFormats','0,3','3.1');
+select fn_db_add_config_value('SupportedStorageFormats','0,3','3.2');
select fn_db_add_config_value('SupportedVDSMVersions','4.5,4.9','general');
select fn_db_add_config_value('SupportGetDevicesVisibility','false','2.2');
select fn_db_add_config_value('SupportGetDevicesVisibility','true','3.0');
select fn_db_add_config_value('SupportGetDevicesVisibility','true','3.1');
+select fn_db_add_config_value('SupportGetDevicesVisibility','true','3.2');
select fn_db_add_config_value('SupportStorageFormat','false','2.2');
select fn_db_add_config_value('SupportStorageFormat','true','3.0');
select fn_db_add_config_value('SupportStorageFormat','true','3.1');
+select fn_db_add_config_value('SupportStorageFormat','true','3.2');
select fn_db_add_config_value('SupportForceCreateVG','false','2.2');
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('SysPrep2K3Path','backend/manager/conf/sysprep/sysprep.2k3','general');
select
fn_db_add_config_value('SysPrep2K8Path','backend/manager/conf/sysprep/sysprep.2k8','general');
select
fn_db_add_config_value('SysPrep2K8R2Path','backend/manager/conf/sysprep/sysprep.2k8','general');
@@ -402,11 +427,13 @@
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');
select fn_db_add_config_value('UseRtl8139_pv','false','3.0');
select fn_db_add_config_value('UseRtl8139_pv','false','3.1');
+select fn_db_add_config_value('UseRtl8139_pv','false','3.2');
--Handling Use Secure Connection with Hosts
select
fn_db_add_config_value('UseSecureConnectionWithServers','true','general');
select fn_db_add_config_value('UseVdsBrokerInProc','true','general');
@@ -424,6 +451,7 @@
select
fn_db_add_config_value('VdsFenceType','alom,apc,bladecenter,drac5,eps,ilo,ipmilan,rsa,rsb,wti,cisco_ucs','2.2');
select
fn_db_add_config_value('VdsFenceType','alom,apc,bladecenter,drac5,eps,ilo,ipmilan,rsa,rsb,wti,cisco_ucs','3.0');
select
fn_db_add_config_value('VdsFenceType','alom,apc,bladecenter,drac5,eps,ilo,ipmilan,rsa,rsb,wti,cisco_ucs','3.1');
+select
fn_db_add_config_value('VdsFenceType','alom,apc,bladecenter,drac5,eps,ilo,ipmilan,rsa,rsb,wti,cisco_ucs','3.2');
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');
@@ -438,6 +466,7 @@
select fn_db_add_config_value('VM64BitMaxMemorySizeInMB','262144','2.2');
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('VmGracefulShutdownMessage','The oVirt Engine is
shutting down this Virtual Machine','general');
select fn_db_add_config_value('VmGracefulShutdownTimeout','30','general');
select fn_db_add_config_value('VMMinMemorySizeInMB','256','general');
@@ -475,10 +504,10 @@
select fn_db_update_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; 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;','3.1');
select
fn_db_update_config_value('SignLockFile','/var/lock/ovirt-engine/.openssl.exclusivelock','general');
select fn_db_update_config_value('SpiceDriverNameInGuest','{"windows":
"RHEV-Spice", "linux" : "xorg-x11-drv-qxl" }','general');
-select
fn_db_update_config_value('SupportedClusterLevels','2.2,3.0,3.1','general');
+select
fn_db_update_config_value('SupportedClusterLevels','2.2,3.0,3.1,3.2','general');
select fn_db_update_config_value('SupportedStorageFormats','0,3','3.1');
select
fn_db_update_config_value('SupportedVDSMVersions','4.5,4.9,4.10','general');
-select fn_db_update_config_value('VdcVersion','3.1.0.0','general');
+select fn_db_update_config_value('VdcVersion','3.2.0.0','general');
select fn_db_update_config_value('ProductRPMVersion','3.1.0.0','general');
select
fn_db_update_config_value('VdsFenceOptionMapping','alom:secure=secure,port=ipport;apc:secure=secure,port=ipport,slot=port;bladecenter:secure=secure,port=ipport,slot=port;drac5:secure=secure,port=ipport;eps:slot=port;ilo:secure=ssl,port=ipport;ipmilan:;rsa:secure=secure,port=ipport;rsb:;wti:secure=secure,port=ipport,slot=port;cisco_ucs:secure=ssl,slot=port','general');
select
fn_db_update_config_value('VdsFenceOptionMapping','alom:secure=secure,port=ipport;apc:secure=secure,port=ipport,slot=port;bladecenter:secure=secure,port=ipport,slot=port;drac5:secure=secure,port=ipport;eps:slot=port;ilo:secure=ssl,port=ipport;ipmilan:;rsa:secure=secure,port=ipport;rsb:;wti:secure=secure,port=ipport,slot=port;cisco_ucs:secure=ssl,slot=port;ilo3:','general');
--
To view, visit http://gerrit.ovirt.org/7169
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4ed674435fbfa12dcc9e280e32145270da0278a
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
