Sandro Bonazzola has uploaded a new change for review. Change subject: Revert "don't use vdsm backend when there is not valid vol or imgUUID" ......................................................................
Revert "don't use vdsm backend when there is not valid vol or imgUUID" This reverts commit 009bac76f5587aaccbd78efb46c7015149d24751. The change caused ovirt-hosted-engine-setup to fail while deploying first host. Change-Id: I98e7018c74a25a899e575dd6df856fd975486ec6 Signed-off-by: Sandro Bonazzola <[email protected]> --- M ovirt_hosted_engine_ha/agent/hosted_engine.py M ovirt_hosted_engine_ha/lib/storage_backends.py 2 files changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-hosted-engine-ha refs/changes/70/36270/1 diff --git a/ovirt_hosted_engine_ha/agent/hosted_engine.py b/ovirt_hosted_engine_ha/agent/hosted_engine.py index 9b78fbc..b0b9a58 100644 --- a/ovirt_hosted_engine_ha/agent/hosted_engine.py +++ b/ovirt_hosted_engine_ha/agent/hosted_engine.py @@ -423,7 +423,7 @@ ).dump() } # check if we have all the needed config params needed for vdsm api - if any(v in ('None', None, '') for v in storage_params.values()): + if [v for k, v in storage_params.items() if v is '']: storage_params = { 'sd_uuid': sd_uuid, 'dom_type': dom_type diff --git a/ovirt_hosted_engine_ha/lib/storage_backends.py b/ovirt_hosted_engine_ha/lib/storage_backends.py index 3b14683..3629021 100644 --- a/ovirt_hosted_engine_ha/lib/storage_backends.py +++ b/ovirt_hosted_engine_ha/lib/storage_backends.py @@ -147,8 +147,6 @@ __slots__ = ["image_uuid", "volume_uuid", "path"] def __init__(self, image_uuid, volume_uuid, path=None): - if any(k in (None, "None", "") for k in (image_uuid, volume_uuid)): - raise ValueError("image_uuid or volume_uuid is missing or None") self.image_uuid = image_uuid self.volume_uuid = volume_uuid self.path = path -- To view, visit http://gerrit.ovirt.org/36270 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I98e7018c74a25a899e575dd6df856fd975486ec6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-hosted-engine-ha Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
