Martin Betak has uploaded a new change for review. Change subject: core: Drop legacy SysPrep paths from config ......................................................................
core: Drop legacy SysPrep paths from config Change-Id: I675340ae90aa724b935b0cf0a25544c06b0177eb Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1086768 Signed-off-by: Martin Betak <mbe...@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql M packaging/etc/engine-config/engine-config.properties 3 files changed, 10 insertions(+), 61 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/31/34831/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java index d938b9b..bd59128 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java @@ -277,34 +277,6 @@ @TypeConverterAttribute(Integer.class) @DefaultValueAttribute("3") MaxRerunVmOnVdsCount, - @Reloadable - @TypeConverterAttribute(String.class) - @DefaultValueAttribute("") - SysPrepXPPath, - @Reloadable - @TypeConverterAttribute(String.class) - @DefaultValueAttribute("") - SysPrep2K3Path, - @Reloadable - @TypeConverterAttribute(String.class) - @DefaultValueAttribute("") - SysPrep2K8Path, - @Reloadable - @TypeConverterAttribute(String.class) - @DefaultValueAttribute("") - SysPrep2K8x64Path, - @Reloadable - @TypeConverterAttribute(String.class) - @DefaultValueAttribute("") - SysPrep2K8R2Path, - @Reloadable - @TypeConverterAttribute(String.class) - @DefaultValueAttribute("") - SysPrepWindows7Path, - @Reloadable - @TypeConverterAttribute(String.class) - @DefaultValueAttribute("") - SysPrepWindows7x64Path, @TypeConverterAttribute(Integer.class) @DefaultValueAttribute("1000") MaxVmsInPool, @@ -1291,23 +1263,11 @@ @TypeConverterAttribute(String.class) @DefaultValueAttribute("") - SysPrepWindows8Path, - - @TypeConverterAttribute(String.class) - @DefaultValueAttribute("") ProductKeyWindows8, @TypeConverterAttribute(String.class) @DefaultValueAttribute("") - SysPrepWindows8x64Path, - - @TypeConverterAttribute(String.class) - @DefaultValueAttribute("") ProductKeyWindows8x64, - - @TypeConverterAttribute(String.class) - @DefaultValueAttribute("") - SysPrepWindows2012x64Path, @TypeConverterAttribute(String.class) @DefaultValueAttribute("") diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 7719bbb..447c8de 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -632,19 +632,8 @@ select fn_db_add_config_value('SupportForceCreateVG','false','3.0'); 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('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'); -select fn_db_add_config_value('SysPrep2K8x64Path','/etc/ovirt-engine/sysprep/sysprep.2k8','general'); select fn_db_add_config_value('SysPrepDefaultPassword','','general'); select fn_db_add_config_value('SysPrepDefaultUser','','general'); -select fn_db_add_config_value('SysPrepWindows7Path','/etc/ovirt-engine/sysprep/sysprep.w7','general'); -select fn_db_add_config_value('SysPrepWindows7x64Path','/etc/ovirt-engine/sysprep/sysprep.w7x64','general'); -select fn_db_add_config_value('SysPrepWindows8Path','/etc/ovirt-engine/sysprep/sysprep.w8','general'); -select fn_db_add_config_value('SysPrepWindows8x64Path','/etc/ovirt-engine/sysprep/sysprep.w8x64','general'); -select fn_db_add_config_value('SysPrepWindows2012x64Path','/etc/ovirt-engine/sysprep/sysprep.2k12x64','general'); ---Handling Path to an XP machine Sys-Prep file. -select fn_db_add_config_value('SysPrepXPPath','/etc/ovirt-engine/sysprep/sysprep.xp','general'); select fn_db_add_config_value('ThrottlerMaxWaitForVdsUpdateInMillis','10000','general'); select fn_db_add_config_value('TimeoutToResetVdsInSeconds','60','general'); select fn_db_add_config_value('DelayResetForSpmInSeconds','20','general'); @@ -1161,6 +1150,16 @@ select fn_db_delete_config_value('GlusterAysncTasksSupport','3.0,3.1,3.2,3.3'); select fn_db_delete_config_value('NormalizedMgmgNetworkEnabled','3.0,3.1,3.2'); select fn_db_delete_config_value('HotPlugCpuEnabled','3.0,3.1,3.2,3.3,3.4,3.5'); +select fn_db_delete_config_value('SysPrepXPPath','general'); +select fn_db_delete_config_value('SysPrep2K3Path','general'); +select fn_db_delete_config_value('SysPrep2K8Path','general'); +select fn_db_delete_config_value('SysPrep2K8R2Path','general'); +select fn_db_delete_config_value('SysPrep2K8x64Path','general'); +select fn_db_delete_config_value('SysPrepWindows7Path','general'); +select fn_db_delete_config_value('SysPrepWindows7x64Path','general'); +select fn_db_delete_config_value('SysPrepWindows8Path','general'); +select fn_db_delete_config_value('SysPrepWindows8x64Path','general'); +select fn_db_delete_config_value('SysPrepWindows2012x64Path','general'); ------------------------------------------------------------------------------------ -- Split config section -- The purpose of this section is to treat config option that was once diff --git a/packaging/etc/engine-config/engine-config.properties b/packaging/etc/engine-config/engine-config.properties index 6e94968..78fe73f 100644 --- a/packaging/etc/engine-config/engine-config.properties +++ b/packaging/etc/engine-config/engine-config.properties @@ -153,16 +153,6 @@ StorageDomainFailureTimeoutInMinutes.type=Integer StoragePoolRefreshTimeInSeconds.description="Storage Pool Manager Polling Rate (in seconds)" StoragePoolRefreshTimeInSeconds.type=Integer -SysPrep2K3Path.description="Path to a Windows 2003 machine Sys-Prep file." -SysPrep2K8Path.description="Path to a Windows 2008 machine Sys-Prep file." -SysPrep2K8R2Path.description="Path to a Windows 2008 R2 machine Sys-Prep file." -SysPrep2K8x64Path.description="Path to a Windows 2008 x64 machine Sys-Prep file." -SysPrepWindows7Path.description="Path to a Windows 7 machine Sys-Prep file." -SysPrepWindows7x64Path.description="Path to a Windows 7 x64 machine Sys-Prep file." -SysPrepWindows8Path.description= "Path to a Windows 8 machine Sys-Prep file." -SysPrepWindows8x64Path.description= "Path to a Windows 8 x64 machine Sys-Prep file." -SysPrepWindows2012x64Path.description="Path to a Windows 2012 x64 machine Sys-Prep file." -SysPrepXPPath.description="Path to a Windows XP machine Sys-Prep file." TimeoutToResetVdsInSeconds.description="Base Communication timeout in seconds before trying to reset a host" TimeoutToResetVdsInSeconds.type=Integer DelayResetForSpmInSeconds.description="Additional delay before reset due to a communication issue, when host is SPM" -- To view, visit http://gerrit.ovirt.org/34831 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I675340ae90aa724b935b0cf0a25544c06b0177eb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Betak <mbe...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
