From 29453ffb356c38874cc86e94e2e23ccaa76c3998 Mon Sep 17 00:00:00 2001 From: hemak88 Date: Fri, 8 Sep 2023 17:08:58 +0400 Subject: [PATCH 1/3] storage_error_resume_behaviour of ovirt vm feature Signed-off-by: hemak88 --- plugins/modules/ovirt_vm.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/plugins/modules/ovirt_vm.py b/plugins/modules/ovirt_vm.py index cad870ff..53d9ca72 100644 --- a/plugins/modules/ovirt_vm.py +++ b/plugins/modules/ovirt_vm.py @@ -750,6 +750,10 @@ - "If no value is passed, default value is set by oVirt/RHV engine." choices: ['interleave', 'preferred', 'strict'] type: str + storage_error_resume_behaviour: + description: + - storage error resume behaviour. "auto_resume", "kill", "leave_paused" + version_added: "2.9" numa_nodes: description: - "List of vNUMA Nodes to set for this VM and pin them to assigned host's physical NUMA node." @@ -1676,6 +1680,9 @@ def build_entity(self): numa_tune_mode=otypes.NumaTuneMode( self.param('numa_tune_mode') ) if self.param('numa_tune_mode') else None, + storage_error_resume_behaviour=otypes.VmStorageErrorResumeBehaviour( + self.param('storage_error_resume_behaviour') + ) if self.param('storage_error_resume_behaviour') else None, rng_device=otypes.RngDevice( source=otypes.RngSource(self.param('rng_device')), ) if self.param('rng_device') else None, @@ -1800,6 +1807,7 @@ def check_custom_compatibility_version(): equal(self.param('serial_policy'), str(getattr(entity.serial_number, 'policy', None))) and equal(self.param('serial_policy_value'), getattr(entity.serial_number, 'value', None)) and equal(self.param('numa_tune_mode'), str(entity.numa_tune_mode)) and + equal(self.param('storage_error_resume_behaviour'), str(entity.storage_error_resume_behaviour)) and equal(self.param('virtio_scsi_enabled'), getattr(entity.virtio_scsi, 'enabled', None)) and equal(self.param('multi_queues_enabled'), entity.multi_queues_enabled) and equal(self.param('virtio_scsi_multi_queues'), entity.virtio_scsi_multi_queues) and @@ -2624,6 +2632,7 @@ def main(): ballooning_enabled=dict(type='bool', default=None), rng_device=dict(type='str'), numa_tune_mode=dict(type='str', choices=['interleave', 'preferred', 'strict']), + storage_error_resume_behaviour=dict(type='str', choices=['auto_resume', 'leave_paused', 'kill']), numa_nodes=dict(type='list', default=[], elements='dict'), custom_properties=dict(type='list', elements='dict'), watchdog=dict(type='dict'), From e27545555a9ba90ac9529064e3371c2b0579a472 Mon Sep 17 00:00:00 2001 From: hemak88 Date: Fri, 8 Sep 2023 18:08:03 +0400 Subject: [PATCH 2/3] storage_error_resume_behaviour of ovirt vm feature Signed-off-by: hemak88 --- .../721-enhancement-vm-storage-error-resume-behaviour.yml | 3 +++ plugins/modules/ovirt_vm.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/721-enhancement-vm-storage-error-resume-behaviour.yml diff --git a/changelogs/fragments/721-enhancement-vm-storage-error-resume-behaviour.yml b/changelogs/fragments/721-enhancement-vm-storage-error-resume-behaviour.yml new file mode 100644 index 00000000..18d70a1e --- /dev/null +++ b/changelogs/fragments/721-enhancement-vm-storage-error-resume-behaviour.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - storage_error_resume_behaviour - Support VM storage error resume behaviour. "auto_resume", "kill", "leave_paused". (https://github.com/oVirt/ovirt-ansible-collection/pull/721) diff --git a/plugins/modules/ovirt_vm.py b/plugins/modules/ovirt_vm.py index 53d9ca72..32a1159c 100644 --- a/plugins/modules/ovirt_vm.py +++ b/plugins/modules/ovirt_vm.py @@ -753,7 +753,7 @@ storage_error_resume_behaviour: description: - storage error resume behaviour. "auto_resume", "kill", "leave_paused" - version_added: "2.9" + version_added: "3.2.0" numa_nodes: description: - "List of vNUMA Nodes to set for this VM and pin them to assigned host's physical NUMA node." From 09d4d9dee87699ce7b8810bc2db86174d876ea54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ne=C4=8Das?= Date: Fri, 8 Sep 2023 16:39:39 +0200 Subject: [PATCH 3/3] Update storage_error_resume_behaviour docs Signed-off-by: Martin Necas --- .../721-enhancement-vm-storage-error-resume-behaviour.yml | 2 +- plugins/modules/ovirt_vm.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changelogs/fragments/721-enhancement-vm-storage-error-resume-behaviour.yml b/changelogs/fragments/721-enhancement-vm-storage-error-resume-behaviour.yml index 18d70a1e..665614c5 100644 --- a/changelogs/fragments/721-enhancement-vm-storage-error-resume-behaviour.yml +++ b/changelogs/fragments/721-enhancement-vm-storage-error-resume-behaviour.yml @@ -1,3 +1,3 @@ --- minor_changes: - - storage_error_resume_behaviour - Support VM storage error resume behaviour. "auto_resume", "kill", "leave_paused". (https://github.com/oVirt/ovirt-ansible-collection/pull/721) + - storage_error_resume_behaviour - Support VM storage error resume behaviour "auto_resume", "kill", "leave_paused". (https://github.com/oVirt/ovirt-ansible-collection/pull/721) diff --git a/plugins/modules/ovirt_vm.py b/plugins/modules/ovirt_vm.py index 32a1159c..3d41ec6d 100644 --- a/plugins/modules/ovirt_vm.py +++ b/plugins/modules/ovirt_vm.py @@ -752,7 +752,10 @@ type: str storage_error_resume_behaviour: description: - - storage error resume behaviour. "auto_resume", "kill", "leave_paused" + - "If the storage, on which this virtual machine has some disks gets unresponsive, the virtual machine gets paused." + - "These are the possible options, what should happen with the virtual machine at the moment the storage becomes available again." + choices: ['auto_resume', 'kill', 'leave_paused'] + type: str version_added: "3.2.0" numa_nodes: description: