Change in ovirt-hosted-engine-ha[master]: upgrade: fix upgrade from partially upgraded condition

[msivak at redhat.com]

Martin Sivák has submitted this change and it was merged.

Change subject: upgrade: fix upgrade from partially upgraded condition
......................................................................


upgrade: fix upgrade from partially upgraded condition

The upgrade procedure has to move the hosted-engine
configuration to the shared storage and it has to
disconnect the hosted-engine storage domain from its
bootstrap storage pool.
The two tasks can be performed by different attempts.

_move_to_shared_conf was connecting the bootstrap
storage pool leaving it connected for further steps.
_remove_storage_pool was assuming that it was
already connected.
But if the configuration volume is OK it skips
_move_to_shared_conf and, if the system has been
rebooted in the middle, _remove_storage_pool fails
cause the storage pool is not connected.

Connecting the storage pool if needed also from
_remove_storage_pool

Change-Id: Ibc5782d2f245129b2bb2f7e70f2558d820eb4267
Bug-Url: https://bugzilla.redhat.com/1292652
Signed-off-by: Simone Tiraboschi <stirabos at redhat.com>
---
M ovirt_hosted_engine_ha/lib/upgrade.py
1 file changed, 21 insertions(+), 4 deletions(-)

Approvals:
  Sandro Bonazzola: Looks good to me, but someone else must approve
  Martin Sivák: Looks good to me, approved; Passed CI tests
  Simone Tiraboschi: Verified



-- 
To view, visit https://gerrit.ovirt.org/50699
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc5782d2f245129b2bb2f7e70f2558d820eb4267
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-hosted-engine-ha
Gerrit-Branch: master
Gerrit-Owner: Simone Tiraboschi <stirabos at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Sivák <msivak at redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer at redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: Simone Tiraboschi <stirabos at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>