Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ovirt_disk: ignore moving of hosted engine disks #162

Merged
merged 4 commits into from
Oct 27, 2020
Merged

ovirt_disk: ignore moving of hosted engine disks #162

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
957733e
ovirt_disk: ignore moving of hosted engine disks
mnecas Oct 26, 2020
b17e7b5
add search params when disk is missing
mnecas Oct 27, 2020
0e0edd8
fix pep8
mnecas Oct 27, 2020
c94ae87
fix pep8 2
mnecas Oct 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion plugins/modules/ovirt_disk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,9 @@ def update_storage_domains(self, disk_id):
# We don't support move&copy for non file based storages:
if disk.storage_type != otypes.DiskStorageType.IMAGE:
return changed

if disk.content_type in [
otypes.DiskContentType(x) for x in ['hosted_engine', 'hosted_engine_sanlock', 'hosted_engine_metadata', 'hosted_engine_configuration']]:
return changed
# Initiate move:
if self._module.params['storage_domain']:
new_disk_storage_id = get_id_by_name(sds_service, self._module.params['storage_domain'])
Expand Down Expand Up @@ -794,6 +796,7 @@ def main():
ret = disks_module.create(
entity=disk if not force_create else None,
result_state=otypes.DiskStatus.OK if lun is None else None,
search_params=searchable_attributes(module),
fail_condition=lambda d: d.status == otypes.DiskStatus.ILLEGAL if lun is None else False,
force_create=force_create,
_wait=True if module.params['upload_image_path'] else module.params['wait'],
Expand Down