Martin Peřina has uploaded a new change for review. Change subject: core: Adds config of command to restart VDSM by SSH ......................................................................
core: Adds config of command to restart VDSM by SSH Adds RestartVdsmBySshCommand configuration value, that contains command to restart VDSM on host using SSH connection. Change-Id: I9f96cbe0c5fdc33f8f512c36d1cd85349852f2da Bug-Url: https://bugzilla.redhat.com/967328 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java M packaging/etc/engine-config/engine-config.properties 4 files changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/15797/1 diff --git a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql index 7695d3c..7207919 100644 --- a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -551,6 +551,11 @@ select fn_db_add_config_value('CustomDeviceProperties', '', '3.2'); select fn_db_add_config_value('CustomDeviceProperties', '', '3.3'); +select fn_db_add_config_value('RestartVdsmBySshCommand', 'service vdsmd restart', '3.0'); +select fn_db_add_config_value('RestartVdsmBySshCommand', 'service vdsmd restart', '3.1'); +select fn_db_add_config_value('RestartVdsmBySshCommand', 'service vdsmd restart', '3.2'); +select fn_db_add_config_value('RestartVdsmBySshCommand', 'service vdsmd restart', '3.3'); + ------------------------------------------------------------------------------------ -- Update with override section ------------------------------------------------------------------------------------ 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 9b6d02b..9fe697d 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 @@ -1374,6 +1374,10 @@ @DefaultValueAttribute("false") MemorySnapshotSupported(511), + @TypeConverterAttribute(String.class) + @DefaultValueAttribute("service vdsmd restart") + RestartVdsmBySshCommand(512), + Invalid(65535); private int intValue; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java index 6d857ce..74a1c6c 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java @@ -90,7 +90,8 @@ VncKeyboardLayoutValidValues(ConfigAuthType.User), SupportCustomDeviceProperties(ConfigAuthType.User), CustomDeviceProperties(ConfigAuthType.User), - MultipleGatewaysSupported + MultipleGatewaysSupported, + RestartVdsmBySshCommand ; public static enum ConfigAuthType { diff --git a/packaging/etc/engine-config/engine-config.properties b/packaging/etc/engine-config/engine-config.properties index 910f9f6..94e40fb 100644 --- a/packaging/etc/engine-config/engine-config.properties +++ b/packaging/etc/engine-config/engine-config.properties @@ -272,3 +272,5 @@ GlusterRefreshRateHooks.description="Refresh rate (in seconds) of gluster hooks from gluster servers" GlusterRefreshRateHooks.type=Integer GlusterRefreshRateHooks.validValues=30..3600 +RestartVdsmBySshCommand.description="Command that restarts VDSM on host using SSH connection" +RestartVdsmBySshCommand.type=String \ No newline at end of file -- To view, visit http://gerrit.ovirt.org/15797 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9f96cbe0c5fdc33f8f512c36d1cd85349852f2da 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
