Ravi Nori has uploaded a new change for review. Change subject: core : Upgrading a hypervisor automatically puts it into an Up state ......................................................................
core : Upgrading a hypervisor automatically puts it into an Up state If the host is not rebooted it needs to go to maintenance instead of Up state. Change-Id: I6dbe7f492e7202b46f993d6ae3ac14714e39d768 Bug-Url: https://bugzilla.redhat.com/1073070 Signed-off-by: Ravi Nori <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpgradeOvirtNodeInternalCommand.java 2 files changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/94/27394/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java index be9aae0..afd5ecd 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java @@ -152,7 +152,11 @@ if (!configureNetworkUsingHostDeploy) { configureManagementNetwork(); } - setVdsStatus(VDSStatus.Initializing); + if (VDSStatus.Maintenance.equals(vdsInitialStatus)) { + setVdsStatus(VDSStatus.Maintenance); + } else { + setVdsStatus(VDSStatus.Initializing); + } break; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpgradeOvirtNodeInternalCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpgradeOvirtNodeInternalCommand.java index f4a4cb7..8475a2b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpgradeOvirtNodeInternalCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpgradeOvirtNodeInternalCommand.java @@ -156,7 +156,11 @@ RunSleepOnReboot(getStatusOnReboot()); break; case Complete: - setVdsStatus(VDSStatus.Initializing); + if (VDSStatus.Maintenance.equals(vdsInitialStatus)) { + setVdsStatus(VDSStatus.Maintenance); + } else { + setVdsStatus(VDSStatus.Initializing); + } break; } -- To view, visit http://gerrit.ovirt.org/27394 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6dbe7f492e7202b46f993d6ae3ac14714e39d768 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
