Martin Peřina has uploaded a new change for review. Change subject: core: Fix ConfigValues.SSHInactivityTimoutSeconds name ......................................................................
core: Fix ConfigValues.SSHInactivityTimoutSeconds name Renames ConfigValues attribute SSHInactivityTimoutSeconds to SSHInactivityTimeoutSeconds. Change-Id: I1dcd2ecc787869892eb63a157b4efd0b468113f5 Bug-Url: https://bugzilla.redhat.com/1112036 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/EngineSSHClient.java 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 4 files changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/29060/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/EngineSSHClient.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/EngineSSHClient.java index 4e18c44..3ece55f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/EngineSSHClient.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/EngineSSHClient.java @@ -37,7 +37,7 @@ ); setSoftTimeout( Config.<Integer>getValue( - ConfigValues.SSHInactivityTimoutSeconds + ConfigValues.SSHInactivityTimeoutSeconds ) * 1000 ); } 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 c97330c..5561f7f 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 @@ -332,7 +332,7 @@ @Reloadable @TypeConverterAttribute(Integer.class) @DefaultValueAttribute("300") - SSHInactivityTimoutSeconds, + SSHInactivityTimeoutSeconds, @Reloadable @TypeConverterAttribute(Integer.class) @DefaultValueAttribute("120") diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 38c944b..53d598e 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -28,6 +28,7 @@ select fn_db_rename_config_key('UseSecureConnectionWithServers', 'EncryptHostCommunication', 'general'); select fn_db_rename_config_key('SpiceReleaseCursorKeys', 'ConsoleReleaseCursorKeys', 'general'); select fn_db_rename_config_key('SpiceToggleFullScreenKeys', 'ConsoleToggleFullScreenKeys', 'general'); +select fn_db_rename_config_key('SSHInactivityTimoutSeconds', 'SSHInactivityTimeoutSeconds', 'general'); ------------------------------------------------------------------------------------ -- Add configuration values section @@ -546,7 +547,7 @@ select fn_db_add_config_value('SpmCommandFailOverRetries','3','general'); select fn_db_add_config_value('SPMFailOverAttempts','3','general'); select fn_db_add_config_value('SpmVCpuConsumption','1','general'); -select fn_db_add_config_value('SSHInactivityTimoutSeconds','300','general'); +select fn_db_add_config_value('SSHInactivityTimeoutSeconds','300','general'); select fn_db_add_config_value('SSHInactivityHardTimoutSeconds','1800','general'); --Handling SPICE SSL Enabled select fn_db_add_config_value('SSLEnabled','true','general'); @@ -1059,6 +1060,8 @@ select fn_db_delete_config_value('VirtIoScsiUnsupportedOsList','general'); select fn_db_delete_config_value('EnableMACAntiSpoofingFilterRules', '3.0'); select fn_db_delete_config_value('EnableMACAntiSpoofingFilterRules', '3.1'); +select fn_db_delete_config_value('SSHInactivityTimoutSeconds','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 a530baa..cddeb1b 100644 --- a/packaging/etc/engine-config/engine-config.properties +++ b/packaging/etc/engine-config/engine-config.properties @@ -130,8 +130,8 @@ SPMFailOverAttempts.type=Integer SpmVCpuConsumption.description="The CPU consumption of SPM embodied as number of VCPUs on the Host" SpmVCpuConsumption.type=Integer -SSHInactivityTimoutSeconds.description="SSH Inactivity Timeout (in seconds)" -SSHInactivityTimoutSeconds.type=Integer +SSHInactivityTimeoutSeconds.description="SSH Inactivity Timeout (in seconds)" +SSHInactivityTimeoutSeconds.type=Integer SSHInactivityHardTimoutSeconds.description="SSH Inactivity Hard Timeout (in seconds)" SSHInactivityHardTimoutSeconds.type=Integer NumberOfUSBSlots.description="Number of USB slots in VMs with native USB support" -- To view, visit http://gerrit.ovirt.org/29060 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1dcd2ecc787869892eb63a157b4efd0b468113f5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
