Martin Peřina has uploaded a new change for review. Change subject: core: Configure fence_kdump during host deploy ......................................................................
core: Configure fence_kdump during host deploy Sets parameters for kdump plugin in host deploy, so fence_kdump will be properly configured during host deploy for hosts with enabled kdump detection. WARNING: Don't merge this patch until [1] is merged and ovirt-host-deploy 1.2.2 released, otherwise engine build will be broken. Change-Id: Idc12188588a6a35b8f03d26a9ee5ea55898943df Bug-Url: https://bugzilla.redhat.com/1079821 Signed-off-by: Martin Perina <mper...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java M pom.xml 2 files changed, 35 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/28386/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java index 3c86e37..85f9776 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java @@ -60,6 +60,7 @@ import org.ovirt.ovirt_host_deploy.constants.Const; import org.ovirt.ovirt_host_deploy.constants.Displays; import org.ovirt.ovirt_host_deploy.constants.GlusterEnv; +import org.ovirt.ovirt_host_deploy.constants.KdumpEnv; import org.ovirt.ovirt_host_deploy.constants.OpenStackEnv; import org.ovirt.ovirt_host_deploy.constants.VdsmEnv; import org.ovirt.ovirt_host_deploy.constants.VirtEnv; @@ -565,6 +566,39 @@ return true; }}, new Callable<Boolean>() { public Boolean call() throws Exception { + _parser.cliEnvironmentSet( + KdumpEnv.ENABLE, + _vds.isPmKdumpDetection() + ); + return true; + }}, + new Callable<Boolean>() { public Boolean call() throws Exception { + String destinationAddress = Config.<String>getValue(ConfigValues.FenceKdumpDestinationAddress); + if (StringUtils.isBlank(destinationAddress)) { + // destination address not entered, use engine FQDN + destinationAddress = EngineLocalConfig.getInstance().getHost(); + } + _parser.cliEnvironmentSet( + KdumpEnv.DESTINATION_ADDRESS, + destinationAddress + ); + return true; + }}, + new Callable<Boolean>() { public Boolean call() throws Exception { + _parser.cliEnvironmentSet( + KdumpEnv.DESTINATION_PORT, + Config.<Integer>getValue(ConfigValues.FenceKdumpDestinationPort) + ); + return true; + }}, + new Callable<Boolean>() { public Boolean call() throws Exception { + _parser.cliEnvironmentSet( + KdumpEnv.MESSAGE_INTERVAL, + Config.<Integer>getValue(ConfigValues.FenceKdumpMessageInterval) + ); + return true; + }}, + new Callable<Boolean>() { public Boolean call() throws Exception { _parser.cliInstall(); return true; }} diff --git a/pom.xml b/pom.xml index 8d3b2f4..a6d881d 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ <cxf.version>2.2.7</cxf.version> <sshd-core.version>0.11.0</sshd-core.version> <otopi.version>1.2.0</otopi.version> - <ovirt-host-deploy.version>1.2.0</ovirt-host-deploy.version> + <ovirt-host-deploy.version>1.2.2</ovirt-host-deploy.version> <org.ovirt.engine.api.ovirt-engine-extensions-api.version>0.0.0-SNAPSHOT</org.ovirt.engine.api.ovirt-engine-extensions-api.version> <slf4j.version>1.7.5</slf4j.version> <gwt.version>2.5.1</gwt.version> -- To view, visit http://gerrit.ovirt.org/28386 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idc12188588a6a35b8f03d26a9ee5ea55898943df Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <mper...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
