Francesco Romani has uploaded a new change for review. Change subject: engine, backend: enable vmconsole in host deploy ......................................................................
engine, backend: enable vmconsole in host deploy Add glue code to enable the Serial Console in host deploy. Feature wiki page: http://www.ovirt.org/Features/Serial_Console Bug-Url: https://bugzilla.redhat.com/1223671 Signed-off-by: Francesco Romani <from...@redhat.com> Change-Id: Icb0503507d3a03789f1f14d3e95c17d121a60c59 --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/InstallVdsInternalCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java 3 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/88/41388/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommand.java index 702f22d..bcabcae 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommand.java @@ -186,6 +186,7 @@ installVdsParameters.setRebootAfterInstallation(getParameters().isRebootAfterInstallation()); installVdsParameters.setNetworkProviderId(getParameters().getNetworkProviderId()); installVdsParameters.setNetworkMappings(getParameters().getNetworkMappings()); + installVdsParameters.setEnableSerialConsole(getParameters().getEnableSerialConsole()); Map<String, String> values = new HashMap<>(); values.put(VdcObjectType.VDS.name().toLowerCase(), getParameters().getvds().getName()); Step installStep = ExecutionHandler.addSubStep(getExecutionContext(), diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/InstallVdsInternalCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/InstallVdsInternalCommand.java index 63a0da4..d347c31 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/InstallVdsInternalCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/InstallVdsInternalCommand.java @@ -134,6 +134,7 @@ switch (getVds().getVdsType()) { case VDS: installer.setFirewall(parameters.getOverrideFirewall()); + installer.setVMConsole(parameters.getEnableSerialConsole()); break; case oVirtNode: if (parameters.getOverrideFirewall()) { @@ -143,6 +144,7 @@ getVds().getVdsType().name() ); } + installer.setVMConsole(parameters.getEnableSerialConsole()); break; default: throw new IllegalArgumentException( diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java index a9d2d37..4875cf3 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java @@ -21,6 +21,8 @@ private boolean activateHost; + private boolean enableSerialConsole; + /** * reboot the installed Host when done */ @@ -64,6 +66,7 @@ password = passwordVal; authMethod = AuthenticationMethod.Password; rebootAfterInstallation = true; + enableSerialConsole = true; } public VdsOperationActionParameters(VdsStatic vdsStatic) { @@ -73,6 +76,7 @@ public VdsOperationActionParameters() { authMethod = AuthenticationMethod.Password; rebootAfterInstallation = true; + enableSerialConsole = true; } public VdsStatic getVdsStaticData() { @@ -156,4 +160,12 @@ this.networkMappings = networkMappings; } + public void setEnableSerialConsole(boolean enableSerialConsole) { + this.enableSerialConsole = enableSerialConsole; + } + + public boolean getEnableSerialConsole() { + return enableSerialConsole; + } + } -- To view, visit https://gerrit.ovirt.org/41388 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb0503507d3a03789f1f14d3e95c17d121a60c59 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Francesco Romani <from...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
