Eli Mesika has uploaded a new change for review. Change subject: core: Adding 3.6 support ......................................................................
core: Adding 3.6 support Change-Id: I7354f13aabc27f0306afd4f1d2be54f9e71126a1 Signed-off-by: emesika <[email protected]> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBaseTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VersionStorageFormatUtil.java M backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Version.java M packaging/dbscripts/insert_data.sql M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql 5 files changed, 40 insertions(+), 31 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/36518/1 diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBaseTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBaseTest.java index dacfd23..1f3be76 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBaseTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBaseTest.java @@ -68,18 +68,22 @@ mockConfig(ConfigValues.SupportedStorageFormats, Version.v3_3.toString(), "3"), mockConfig(ConfigValues.SupportedStorageFormats, Version.v3_4.toString(), "3"), mockConfig(ConfigValues.SupportedStorageFormats, Version.v3_5.toString(), "3"), + mockConfig(ConfigValues.SupportedStorageFormats, Version.v3_6.toString(), "3"), mockConfig(ConfigValues.GlusterFsStorageEnabled, Version.v3_0.toString(), false), mockConfig(ConfigValues.GlusterFsStorageEnabled, Version.v3_4.toString(), true), mockConfig(ConfigValues.GlusterFsStorageEnabled, Version.v3_5.toString(), true), + mockConfig(ConfigValues.GlusterFsStorageEnabled, Version.v3_6.toString(), true), mockConfig(ConfigValues.PosixStorageEnabled, Version.v3_0.toString(), false), mockConfig(ConfigValues.PosixStorageEnabled, Version.v3_4.toString(), true), mockConfig(ConfigValues.PosixStorageEnabled, Version.v3_5.toString(), true), + mockConfig(ConfigValues.PosixStorageEnabled, Version.v3_6.toString(), true), mockConfig(ConfigValues.MixedDomainTypesInDataCenter, Version.v3_0.toString(), false), mockConfig(ConfigValues.MixedDomainTypesInDataCenter, Version.v3_1.toString(), false), mockConfig(ConfigValues.MixedDomainTypesInDataCenter, Version.v3_2.toString(), false), mockConfig(ConfigValues.MixedDomainTypesInDataCenter, Version.v3_3.toString(), false), mockConfig(ConfigValues.MixedDomainTypesInDataCenter, Version.v3_4.toString(), true), - mockConfig(ConfigValues.MixedDomainTypesInDataCenter, Version.v3_5.toString(), true) + mockConfig(ConfigValues.MixedDomainTypesInDataCenter, Version.v3_5.toString(), true), + mockConfig(ConfigValues.MixedDomainTypesInDataCenter, Version.v3_6.toString(), true) ); @Before diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VersionStorageFormatUtil.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VersionStorageFormatUtil.java index 860210e..218687f 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VersionStorageFormatUtil.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VersionStorageFormatUtil.java @@ -60,6 +60,7 @@ put(Version.v3_3, new ConstantStorageFormatTypeMapper(StorageFormatType.V3)); put(Version.v3_4, new ConstantStorageFormatTypeMapper(StorageFormatType.V3)); put(Version.v3_5, new ConstantStorageFormatTypeMapper(StorageFormatType.V3)); + put(Version.v3_6, new ConstantStorageFormatTypeMapper(StorageFormatType.V3)); } }; diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Version.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Version.java index fe495ab..26c1d6e 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Version.java +++ b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Version.java @@ -22,7 +22,8 @@ public static final Version v3_3 = new Version(3, 3); public static final Version v3_4 = new Version(3, 4); public static final Version v3_5 = new Version(3, 5); - public static final List<Version> ALL = Arrays.asList(v3_0, v3_1, v3_2, v3_3, v3_4, v3_5); + public static final Version v3_6 = new Version(3, 6); + public static final List<Version> ALL = Arrays.asList(v3_0, v3_1, v3_2, v3_3, v3_4, v3_5, v3_6); public Version(String value) { diff --git a/packaging/dbscripts/insert_data.sql b/packaging/dbscripts/insert_data.sql index 4b02491..5369d85 100644 --- a/packaging/dbscripts/insert_data.sql +++ b/packaging/dbscripts/insert_data.sql @@ -31,10 +31,10 @@ --INSERTING DATA INTO TABLE storage_pool -INSERT INTO storage_pool (id,name,description,storage_pool_type,status,master_domain_version,compatibility_version) select v_storage_pool_id,'Default','The default Data Center',1,0,0,'3.5'; +INSERT INTO storage_pool (id,name,description,storage_pool_type,status,master_domain_version,compatibility_version) select v_storage_pool_id,'Default','The default Data Center',1,0,0,'3.6'; --INSERTING DATA INTO TABLE vds_groups -INSERT INTO vds_groups (vds_group_id,name,description,storage_pool_id,compatibility_version,transparent_hugepages) select v_cluster_id,'Default','The default server cluster',v_storage_pool_id,'3.5',true; +INSERT INTO vds_groups (vds_group_id,name,description,storage_pool_id,compatibility_version,transparent_hugepages) select v_cluster_id,'Default','The default server cluster',v_storage_pool_id,'3.6',true; --INSERTING DATA INTO NETWORK table diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 5c8e1f9..7adec74 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -90,6 +90,7 @@ 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.5'); +select fn_db_add_config_value('ClusterEmulatedMachines','rhel7.0.0,pc-1.0,pseries','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'); @@ -160,7 +161,7 @@ select fn_db_add_config_value('GlusterPeerStatusRetries', '2', 'general'); select fn_db_add_config_value('GlusterTaskMinWaitForCleanupInMins', '10', 'general'); -- Gluster Geo-replication -- -select fn_db_add_config_value_for_versions_up_to('GlusterGeoReplicationEnabled', 'false', '3.5'); +select fn_db_add_config_value_for_versions_up_to('GlusterGeoReplicationEnabled', 'false', '3.6'); select fn_db_add_config_value('GlusterRefreshRateGeoRepStatus', '300', 'general'); select fn_db_add_config_value('GlusterRefreshRateGeoRepDiscovery', '3600', 'general'); @@ -176,8 +177,8 @@ 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_for_versions_up_to('HotPlugCpuSupported', '{"x86_64":"false","ppc64":"false"}', '3.3'); -select fn_db_add_config_value_for_versions_up_to('HotPlugCpuSupported', '{"x86_64":"true","ppc64":"false"}', '3.5'); -select fn_db_add_config_value_for_versions_up_to('HotUnplugCpuSupported', '{"x86_64":"false","ppc64":"false"}', '3.5'); +select fn_db_add_config_value_for_versions_up_to('HotPlugCpuSupported', '{"x86_64":"true","ppc64":"false"}', '3.6'); +select fn_db_add_config_value_for_versions_up_to('HotUnplugCpuSupported', '{"x86_64":"false","ppc64":"false"}', '3.6'); -- migration support per architecture select fn_db_add_config_value('IsMigrationSupported','{"undefined": "true", "x86_64": "true", "ppc64" : "true" }','general'); -- snapshot support per architecture @@ -200,7 +201,7 @@ select fn_db_add_config_value_for_versions_up_to('NetworkQosSupported', 'false', '3.2'); select fn_db_add_config_value_for_versions_up_to('StorageQosSupported', 'false', '3.4'); select fn_db_add_config_value_for_versions_up_to('CpuQosSupported', 'false', '3.4'); -select fn_db_add_config_value_for_versions_up_to('HostNetworkQosSupported', 'false', '3.5'); +select fn_db_add_config_value_for_versions_up_to('HostNetworkQosSupported', 'false', '3.6'); select fn_db_add_config_value_for_versions_up_to('CloudInitSupported', 'false', '3.2'); select fn_db_add_config_value('DefaultSysprepLocale','en_US','general'); select fn_db_add_config_value_for_versions_up_to('ImportGlanceImageAsTemplate', 'false', '3.3'); @@ -220,13 +221,13 @@ select fn_db_add_config_value_for_versions_up_to('MixedDomainTypesInDataCenter', 'false', '3.3'); -- default requirement for rng sources (comma-separated string of 'RANDOM' and 'HWRNG') -select fn_db_add_config_value_for_versions_up_to('ClusterRequiredRngSourcesDefault', '', '3.5'); +select fn_db_add_config_value_for_versions_up_to('ClusterRequiredRngSourcesDefault', '', '3.6'); select fn_db_add_config_value_for_versions_up_to('SpiceCopyPasteToggleSupported', 'false', '3.4'); -- Graphics Framebuffer Device support -select fn_db_add_config_value_for_versions_up_to('GraphicsDeviceEnabled','false','3.5'); +select fn_db_add_config_value_for_versions_up_to('GraphicsDeviceEnabled','false','3.6'); -select fn_db_add_config_value_for_versions_up_to('SpiceFileTransferToggleSupported', 'false', '3.5'); +select fn_db_add_config_value_for_versions_up_to('SpiceFileTransferToggleSupported', 'false', '3.6'); select fn_db_add_config_value_for_versions_up_to('StoragePoolMemoryBackend', 'false', '3.4'); select fn_db_add_config_value_for_versions_up_to('JsonProtocolSupported', 'false', '3.4'); @@ -234,9 +235,9 @@ select fn_db_add_config_value_for_versions_up_to('ReportedDisksLogicalNames', 'false', '3.4'); -select fn_db_add_config_value_for_versions_up_to('AutoConvergenceSupported','false','3.5'); +select fn_db_add_config_value_for_versions_up_to('AutoConvergenceSupported','false','3.6'); -select fn_db_add_config_value_for_versions_up_to('MigrationCompressionSupported','false','3.5'); +select fn_db_add_config_value_for_versions_up_to('MigrationCompressionSupported','false','3.6'); -- by default use no proxy select fn_db_add_config_value('SpiceProxyDefault','','general'); @@ -359,10 +360,10 @@ 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_for_versions_up_to('MaxNumOfCpuPerSocket', '16', '3.5'); +select fn_db_add_config_value_for_versions_up_to('MaxNumOfCpuPerSocket', '16', '3.6'); select fn_db_add_config_value('MaxNumOfVmCpus','64','3.0'); -select fn_db_add_config_value_for_versions_up_to('MaxNumOfVmCpus', '160', '3.5'); -select fn_db_add_config_value_for_versions_up_to('MaxNumOfVmSockets', '16', '3.5'); +select fn_db_add_config_value_for_versions_up_to('MaxNumOfVmCpus', '160', '3.6'); +select fn_db_add_config_value_for_versions_up_to('MaxNumOfVmSockets', '16', '3.6'); 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'); @@ -417,7 +418,7 @@ select fn_db_add_config_value('PostgresPagingSyntax',E' OFFSET (%1$s -1) LIMIT %2$s','general'); select fn_db_add_config_value('PostgresPagingType','Offset','general'); select fn_db_add_config_value('PostgresSearchTemplate',E'SELECT * FROM (%2$s) %1$s) as T1 %3$s','general'); -select fn_db_add_config_value_for_versions_up_to('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.5'); +select fn_db_add_config_value_for_versions_up_to('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.6'); select fn_db_add_config_value('ProductRPMVersion','3.0.0.0','general'); select fn_db_add_config_value('QuotaGraceStorage','20','general'); select fn_db_add_config_value('QuotaGraceVdsGroup','20','general'); @@ -435,7 +436,7 @@ select fn_db_add_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; 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;','3.1'); select fn_db_add_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.2'); select fn_db_add_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; :IBM POWER 7 v2.0:powernv,model_POWER7_v2.0:POWER7_v2.0:ppc64; :IBM POWER 7 v2.1:powernv,model_POWER7_v2.1:POWER7_v2.1:ppc64; :IBM POWER 7 v2.3:powernv,model_POWER7_v2.3:POWER7_v2.3:ppc64; :IBM POWER 7+ v2.1:powernv,model_POWER7+_v2.1:POWER7+_v2.1:ppc64; :IBM POWER 8 ! v1.0:powernv,model_POWER8_v1.0:POWER8_v1.0:ppc64;','3.3'); -select fn_db_add_config_value_for_versions_up_to('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_add_config_value_for_versions_up_to('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.6'); 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. @@ -465,7 +466,7 @@ select fn_db_add_config_value('SucceededJobCleanupTimeInMinutes','10','general'); select fn_db_add_config_value('SupportedClusterLevels','3.0','general'); select fn_db_add_config_value('SupportedStorageFormats','0,2','3.0'); -select fn_db_add_config_value_for_versions_up_to('SupportedStorageFormats', '0,2,3','3.5'); +select fn_db_add_config_value_for_versions_up_to('SupportedStorageFormats', '0,2,3','3.6'); select fn_db_add_config_value('SupportedVDSMVersions','4.9,4.10,4.11,4.12,4.13,4.14','general'); select fn_db_add_config_value('SupportForceCreateVG','false','3.0'); @@ -483,7 +484,7 @@ select fn_db_add_config_value('TimeToReduceFailedRunOnVdsInMinutes','30','general'); select fn_db_add_config_value('UnknownTaskPrePollingLapse','60000','general'); select fn_db_add_config_value('UserSessionHardLimit','600','general'); -select fn_db_add_config_value_for_versions_up_to('UserDefinedVMProperties', '','3.5'); +select fn_db_add_config_value_for_versions_up_to('UserDefinedVMProperties', '','3.6'); select fn_db_add_config_value('UserRefreshRate','3600','general'); select fn_db_add_config_value('UserSessionTimeOutInterval','30','general'); select fn_db_add_config_value('UtilizationThresholdInPercent','80','general'); @@ -499,13 +500,13 @@ select fn_db_add_config_value('MaxTotalConnections','20','general'); select fn_db_add_config_value_for_versions_up_to('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','3.1'); select fn_db_add_config_value_for_versions_up_to('VdsFenceOptionMapping','apc:secure=secure,port=ipport,slot=port;apc_snmp:port=port;bladecenter:secure=secure,port=ipport,slot=port;cisco_ucs:secure=ssl,slot=port;drac5:secure=secure,slot=port;eps:slot=port;ilo:secure=ssl,port=ipport;ipmilan:;ilo2:secure=ssl,port=ipport;ilo3:;ilo4:;rsa:secure=secure,port=ipport;rsb:;wti:secure=secure,port=ipport,slot=port','3.3'); -select fn_db_add_config_value_for_versions_up_to('VdsFenceOptionMapping','apc:secure=secure,port=ipport,slot=port;apc_snmp:port=port;bladecenter:secure=secure,port=ipport,slot=port;cisco_ucs:secure=ssl,slot=port;drac5:secure=secure,slot=port;drac7:;eps:slot=port;hpblade:port=port;ilo:secure=ssl,port=ipport;ipmilan:;ilo2:secure=ssl,port=ipport;ilo3:;ilo4:;rsa:secure=secure,port=ipport;rsb:;wti:secure=secure,port=ipport,slot=port','3.5'); +select fn_db_add_config_value_for_versions_up_to('VdsFenceOptionMapping','apc:secure=secure,port=ipport,slot=port;apc_snmp:port=port;bladecenter:secure=secure,port=ipport,slot=port;cisco_ucs:secure=ssl,slot=port;drac5:secure=secure,slot=port;drac7:;eps:slot=port;hpblade:port=port;ilo:secure=ssl,port=ipport;ipmilan:;ilo2:secure=ssl,port=ipport;ilo3:;ilo4:;rsa:secure=secure,port=ipport;rsb:;wti:secure=secure,port=ipport,slot=port','3.6'); select fn_db_add_config_value('CustomVdsFenceOptionMapping','','general'); select fn_db_add_config_value('VdsFenceOptions','','general'); select fn_db_add_config_value('VdsFenceOptionTypes','secure=bool,port=int,slot=int','general'); select fn_db_add_config_value_for_versions_up_to('VdsFenceType','alom,apc,bladecenter,drac5,eps,ilo,ilo3,ipmilan,rsa,rsb,wti,cisco_ucs','3.1'); select fn_db_add_config_value_for_versions_up_to('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_for_versions_up_to('VdsFenceType','apc,apc_snmp,bladecenter,cisco_ucs,drac5,drac7,eps,hpblade,ilo,ilo2,ilo3,ilo4,ipmilan,rsa,rsb,wti','3.5'); +select fn_db_add_config_value_for_versions_up_to('VdsFenceType','apc,apc_snmp,bladecenter,cisco_ucs,drac5,drac7,eps,hpblade,ilo,ilo2,ilo3,ilo4,ipmilan,rsa,rsb,wti','3.6'); select fn_db_add_config_value('CustomVdsFenceType','','general'); select fn_db_add_config_value('vdsHeartbeatInSeconds','10','general'); select fn_db_add_config_value('VdsLoadBalancingIntervalInMinutes','1','general'); @@ -523,7 +524,7 @@ select fn_db_add_config_value('VM32BitMaxMemorySizeInMB','20480','general'); select fn_db_add_config_value('VM64BitMaxMemorySizeInMB','524288','3.0'); select fn_db_add_config_value_for_versions_up_to('VM64BitMaxMemorySizeInMB','2097152','3.3'); -select fn_db_add_config_value_for_versions_up_to('VM64BitMaxMemorySizeInMB','4096000','3.5'); +select fn_db_add_config_value_for_versions_up_to('VM64BitMaxMemorySizeInMB','4096000','3.6'); 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'); @@ -568,15 +569,15 @@ -- Device Custom Properties select fn_db_add_config_value_for_versions_up_to('SupportCustomDeviceProperties', 'false', '3.2'); -select fn_db_add_config_value_for_versions_up_to('CustomDeviceProperties', '', '3.5'); +select fn_db_add_config_value_for_versions_up_to('CustomDeviceProperties', '', '3.6'); -- Network Custom Properties select fn_db_add_config_value_for_versions_up_to('NetworkCustomPropertiesSupported', 'false', '3.4'); -select fn_db_add_config_value('PreDefinedNetworkCustomProperties', $q$bridge_opts=^[^\s=]+=[^\s=]+(\s+[^\s=]+=[^\s=]+)*$$q$, '3.5'); -- tag prevents psql from escaping backslashes ('q' is arbitrary) -select fn_db_add_config_value('UserDefinedNetworkCustomProperties', '', '3.5'); +select fn_db_add_config_value_for_versions_up_to('PreDefinedNetworkCustomProperties', $q$bridge_opts=^[^\s=]+=[^\s=]+(\s+[^\s=]+=[^\s=]+)*$$q$, '3.6'); -- tag prevents psql from escaping backslashes ('q' is arbitrary) +select fn_db_add_config_value_for_versions_up_to('UserDefinedNetworkCustomProperties', '', '3.6'); select fn_db_add_config_value_for_versions_up_to('SshSoftFencingCommand', 'service vdsmd restart', '3.2'); -select fn_db_add_config_value_for_versions_up_to('SshSoftFencingCommand', '/usr/bin/vdsm-tool service-restart vdsmd', '3.5'); +select fn_db_add_config_value_for_versions_up_to('SshSoftFencingCommand', '/usr/bin/vdsm-tool service-restart vdsmd', '3.6'); --attestation configuration select fn_db_add_config_value('SecureConnectionWithOATServers','true','general'); @@ -765,22 +766,24 @@ 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('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','general'); -select fn_db_update_config_value('SupportedStorageFormats','0,2,3','3.1,3.2,3.3,3.4,3.5'); +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'); select fn_db_update_config_value('SupportedVDSMVersions','4.9,4.10,4.11,4.12,4.13,4.14,4.15','general'); -select fn_db_update_config_value('VdcVersion','3.5.0.0','general'); -select fn_db_update_config_value('ProductRPMVersion','3.5.0.0','general'); +select fn_db_update_config_value('VdcVersion','3.6.0.0','general'); +select fn_db_update_config_value('ProductRPMVersion','3.6.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','3.0'); 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','3.1'); select fn_db_update_config_value('VdsFenceOptionMapping','apc:secure=secure,port=ipport,slot=port;apc_snmp:port=port;bladecenter:secure=secure,port=ipport,slot=port;cisco_ucs:secure=ssl,slot=port;drac5:secure=secure,slot=port;eps:slot=port;ilo:secure=ssl,port=ipport;ipmilan:;ilo2:secure=ssl,port=ipport;ilo3:;ilo4:;rsa:secure=secure,port=ipport;rsb:;wti:secure=secure,port=ipport,slot=port','3.2'); select fn_db_update_config_value('VdsFenceOptionMapping','apc:secure=secure,port=ipport,slot=port;apc_snmp:port=port;bladecenter:secure=secure,port=ipport,slot=port;cisco_ucs:secure=ssl,slot=port;drac5:secure=secure,slot=port;eps:slot=port;ilo:secure=ssl,port=ipport;ipmilan:;ilo2:secure=ssl,port=ipport;ilo3:;ilo4:;rsa:secure=secure,port=ipport;rsb:;wti:secure=secure,port=ipport,slot=port','3.3'); select fn_db_update_config_value('VdsFenceOptionMapping','apc:secure=secure,port=ipport,slot=port;apc_snmp:port=port;bladecenter:secure=secure,port=ipport,slot=port;cisco_ucs:secure=ssl,slot=port;drac5:secure=secure,slot=port;drac7:;eps:slot=port;hpblade:port=port;ilo:secure=ssl,port=ipport;ipmilan:;ilo2:secure=ssl,port=ipport;ilo3:;ilo4:;rsa:secure=secure,port=ipport;rsb:;wti:secure=secure,port=ipport,slot=port','3.4'); select fn_db_update_config_value('VdsFenceOptionMapping','apc:secure=secure,port=ipport,slot=port;apc_snmp:port=port;bladecenter:secure=secure,port=ipport,slot=port;cisco_ucs:secure=ssl,slot=port;drac5:secure=secure,slot=port;drac7:;eps:slot=port;hpblade:port=port;ilo:secure=ssl,port=ipport;ipmilan:;ilo2:secure=ssl,port=ipport;ilo3:;ilo4:;rsa:secure=secure,port=ipport;rsb:;wti:secure=secure,port=ipport,slot=port','3.5'); +select fn_db_update_config_value('VdsFenceOptionMapping','apc:secure=secure,port=ipport,slot=port;apc_snmp:port=port;bladecenter:secure=secure,port=ipport,slot=port;cisco_ucs:secure=ssl,slot=port;drac5:secure=secure,slot=port;drac7:;eps:slot=port;hpblade:port=port;ilo:secure=ssl,port=ipport;ipmilan:;ilo2:secure=ssl,port=ipport;ilo3:;ilo4:;rsa:secure=secure,port=ipport;rsb:;wti:secure=secure,port=ipport,slot=port','3.6'); select fn_db_update_config_value('VdsFenceType','alom,apc,bladecenter,drac5,eps,ilo,ilo3,ipmilan,rsa,rsb,wti,cisco_ucs','3.0'); select fn_db_update_config_value('VdsFenceType','alom,apc,bladecenter,drac5,eps,ilo,ilo3,ipmilan,rsa,rsb,wti,cisco_ucs','3.1'); select fn_db_update_config_value('VdsFenceType','apc,apc_snmp,bladecenter,cisco_ucs,drac5,eps,ilo,ilo2,ilo3,ilo4,ipmilan,rsa,rsb,wti','3.2'); select fn_db_update_config_value('VdsFenceType','apc,apc_snmp,bladecenter,cisco_ucs,drac5,drac7,eps,hpblade,ilo,ilo2,ilo3,ilo4,ipmilan,rsa,rsb,wti','3.4'); select fn_db_update_config_value('VdsFenceType','apc,apc_snmp,bladecenter,cisco_ucs,drac5,drac7,eps,hpblade,ilo,ilo2,ilo3,ilo4,ipmilan,rsa,rsb,wti','3.5'); +select fn_db_update_config_value('VdsFenceType','apc,apc_snmp,bladecenter,cisco_ucs,drac5,drac7,eps,hpblade,ilo,ilo2,ilo3,ilo4,ipmilan,rsa,rsb,wti','3.6'); select fn_db_update_config_value('VdsRefreshRate','3','general'); select fn_db_update_config_value('VmGracefulShutdownMessage','System Administrator has initiated shutdown of this Virtual Machine. Virtual Machine is shutting down.','general'); select fn_db_update_config_value('DisconnectPoolOnReconstruct','0,2,3','general'); -- To view, visit http://gerrit.ovirt.org/36518 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7354f13aabc27f0306afd4f1d2be54f9e71126a1 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
