Omer Frenkel has uploaded a new change for review.

Change subject: core: update supported emulated machines for 3.6
......................................................................

core: update supported emulated machines for 3.6

3.6 requires higher level of emulated machines for new features like
hot-plug memory.

for el pc-i440fx-rhel7.2.0
for fedora pc-i440fx-2.1

Change-Id: I55d1ac2bbdca4d9aa6dfc1fbec1236a91866d49c
Signed-off-by: Omer Frenkel <[email protected]>
---
M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/41665/1

diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql 
b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
index eeb3e66..12582ba 100644
--- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
+++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
@@ -92,7 +92,8 @@
 select 
fn_db_add_config_value('ClusterEmulatedMachines','rhel6.3.0,pc-1.0','3.1');
 select 
fn_db_add_config_value('ClusterEmulatedMachines','rhel6.4.0,pc-1.0','3.2');
 select 
fn_db_add_config_value('ClusterEmulatedMachines','rhel6.4.0,pc-1.0,pseries','3.3');
-select 
fn_db_add_config_value_for_versions_up_to('ClusterEmulatedMachines','rhel6.5.0,pc-1.0,pseries','3.6');
+select 
fn_db_add_config_value_for_versions_up_to('ClusterEmulatedMachines','rhel6.5.0,pc-1.0,pseries','3.5');
+select 
fn_db_add_config_value('ClusterEmulatedMachines','pc-i440fx-rhel7.2.0,pc-i440fx-2.1,pseries-rhel7.2.0','3.6');
 select fn_db_add_config_value('CpuOverCommitDurationMinutes','2','general');
 --Handling Data directory for ENGINE
 select fn_db_add_config_value('DataDir','/usr/share/engine','general');
@@ -839,6 +840,7 @@
 select fn_db_update_config_value('ServerCPUList','3:Intel Conroe 
Family:vmx,nx,model_Conroe:Conroe:x86_64; 4:Intel Penryn 
Family:vmx,nx,model_Penryn:Penryn:x86_64; 5:Intel Nehalem 
Family:vmx,nx,model_Nehalem:Nehalem:x86_64; 6:Intel Westmere 
Family:aes,vmx,nx,model_Westmere:Westmere:x86_64; 7:Intel SandyBridge 
Family:vmx,nx,model_SandyBridge:SandyBridge:x86_64; 8:Intel Haswell 
Family:vmx,nx,model_Haswell:Haswell:x86_64; 2:AMD Opteron 
G1:svm,nx,model_Opteron_G1:Opteron_G1:x86_64; 3:AMD Opteron 
G2:svm,nx,model_Opteron_G2:Opteron_G2:x86_64; 4:AMD Opteron 
G3:svm,nx,model_Opteron_G3:Opteron_G3:x86_64; 5:AMD Opteron 
G4:svm,nx,model_Opteron_G4:Opteron_G4:x86_64; 6:AMD Opteron 
G5:svm,nx,model_Opteron_G5:Opteron_G5:x86_64; 3:IBM POWER 
8:powernv,model_power8:power8:ppc64;','3.4');
 select fn_db_update_config_value('ServerCPUList','3:Intel Conroe 
Family:vmx,nx,model_Conroe:Conroe:x86_64; 4:Intel Penryn 
Family:vmx,nx,model_Penryn:Penryn:x86_64; 5:Intel Nehalem 
Family:vmx,nx,model_Nehalem:Nehalem:x86_64; 6:Intel Westmere 
Family:aes,vmx,nx,model_Westmere:Westmere:x86_64; 7:Intel SandyBridge 
Family:vmx,nx,model_SandyBridge:SandyBridge:x86_64; 8:Intel Haswell 
Family:vmx,nx,model_Haswell:Haswell:x86_64; 2:AMD Opteron 
G1:svm,nx,model_Opteron_G1:Opteron_G1:x86_64; 3:AMD Opteron 
G2:svm,nx,model_Opteron_G2:Opteron_G2:x86_64; 4:AMD Opteron 
G3:svm,nx,model_Opteron_G3:Opteron_G3:x86_64; 5:AMD Opteron 
G4:svm,nx,model_Opteron_G4:Opteron_G4:x86_64; 6:AMD Opteron 
G5:svm,nx,model_Opteron_G5:Opteron_G5:x86_64; 3:IBM POWER 
8:powernv,model_power8:power8:ppc64;','3.5');
 select 
fn_db_update_config_value('ClusterEmulatedMachines','rhel6.4.0,pc-1.0,pseries','3.3');
+select 
fn_db_update_config_value('ClusterEmulatedMachines','pc-i440fx-rhel7.2.0,pc-i440fx-2.1,pseries-rhel7.2.0','3.6');
 select fn_db_update_config_value('SpiceDriverNameInGuest','{"windows": 
"RHEV-Spice", "linux" : "xorg-x11-drv-qxl" }','general');
 select 
fn_db_update_config_value('SupportedClusterLevels','3.0,3.1,3.2,3.3,3.4,3.5,3.6','general');
 select 
fn_db_update_config_value('SupportedStorageFormats','0,2,3','3.1,3.2,3.3,3.4,3.5,3.6');


-- 
To view, visit https://gerrit.ovirt.org/41665
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I55d1ac2bbdca4d9aa6dfc1fbec1236a91866d49c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Omer Frenkel <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to