Moti Asayag has uploaded a new change for review.
Change subject: host-deploy: Remove unreachable deploy status
......................................................................
host-deploy: Remove unreachable deploy status
Termination of oVirt-node installation might end
either by installation failure (InstallFailed) or
by rebooting the node (Reboot) in case of a successful
installation.
Change-Id: I21c43254fb969f69bafca65730eab659d068cbb6
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/OVirtNodeUpgrade.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/UpgradeOvirtNodeInternalCommand.java
2 files changed, 2 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/61/40561/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/OVirtNodeUpgrade.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/OVirtNodeUpgrade.java
index a7112c4..af56e46 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/OVirtNodeUpgrade.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/OVirtNodeUpgrade.java
@@ -24,7 +24,7 @@
*/
public class OVirtNodeUpgrade implements SSHDialog.Sink, Closeable {
- public static enum DeployStatus {Complete, Failed, Reboot};
+ public static enum DeployStatus {Failed, Reboot};
private static final int BUFFER_SIZE = 10 * 1024;
private static final int THREAD_JOIN_TIMEOUT = 20 * 1000;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/UpgradeOvirtNodeInternalCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/UpgradeOvirtNodeInternalCommand.java
index d61856a..0bec1c3 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/UpgradeOvirtNodeInternalCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/UpgradeOvirtNodeInternalCommand.java
@@ -13,8 +13,8 @@
import org.ovirt.engine.core.bll.VdsHandler;
import org.ovirt.engine.core.bll.context.CommandContext;
import org.ovirt.engine.core.common.AuditLogType;
-import org.ovirt.engine.core.common.action.LockProperties.Scope;
import org.ovirt.engine.core.common.action.LockProperties;
+import org.ovirt.engine.core.common.action.LockProperties.Scope;
import org.ovirt.engine.core.common.action.hostdeploy.InstallVdsParameters;
import org.ovirt.engine.core.common.businessentities.VDSStatus;
import org.ovirt.engine.core.common.businessentities.VDSType;
@@ -178,13 +178,6 @@
case Reboot:
setVdsStatus(VDSStatus.Reboot);
runSleepOnReboot(getStatusOnReboot());
- break;
- case Complete:
- if (!getParameters().getActivateHost() &&
VDSStatus.Maintenance.equals(vdsInitialStatus)) {
- setVdsStatus(VDSStatus.Maintenance);
- } else {
- setVdsStatus(VDSStatus.Initializing);
- }
break;
}
--
To view, visit https://gerrit.ovirt.org/40561
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I21c43254fb969f69bafca65730eab659d068cbb6
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masa...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
