From c204214df43f535f7bca8b99f94c7222a1a28d10 Mon Sep 17 00:00:00 2001 From: Ondra Machacek Date: Fri, 19 Oct 2018 13:23:46 +0200 Subject: [PATCH] ovirt_vm: Fix initialization of cloud init Fixes: https://github.com/ansible/ansible/issues/45900 This PR fixes the case when the cloud_init_persist was used, but we still sent use_cloud_init=False, which is in oVirt API evaluated as not to use cloud_init in first VM execution. This patch is changing it to send just None, instead of False. Signed-off-by: Ondra Machacek --- .../fragments/ovirt_vm__Fix_initialization_of_cloud_init.yaml | 2 ++ lib/ansible/modules/cloud/ovirt/ovirt_vm.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/ovirt_vm__Fix_initialization_of_cloud_init.yaml diff --git a/changelogs/fragments/ovirt_vm__Fix_initialization_of_cloud_init.yaml b/changelogs/fragments/ovirt_vm__Fix_initialization_of_cloud_init.yaml new file mode 100644 index 00000000000..6f0375424fb --- /dev/null +++ b/changelogs/fragments/ovirt_vm__Fix_initialization_of_cloud_init.yaml @@ -0,0 +1,2 @@ +bugfixes: + - ovirt_vm - Fix initialization of cloud init (https://github.com/ansible/ansible/pull/47354). diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_vm.py b/lib/ansible/modules/cloud/ovirt/ovirt_vm.py index 8db5bc2ac38..799aecb9f97 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_vm.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_vm.py @@ -2039,8 +2039,8 @@ def main(): ), wait_condition=lambda vm: vm.status == otypes.VmStatus.UP, # Start action kwargs: - use_cloud_init=not module.params.get('cloud_init_persist') and module.params.get('cloud_init') is not None, - use_sysprep=not module.params.get('cloud_init_persist') and module.params.get('sysprep') is not None, + use_cloud_init=True if not module.params.get('cloud_init_persist') and module.params.get('cloud_init') is not None else None, + use_sysprep=True if not module.params.get('cloud_init_persist') and module.params.get('sysprep') is not None else None, vm=otypes.Vm( placement_policy=otypes.VmPlacementPolicy( hosts=[otypes.Host(name=module.params['host'])]