From b66f77352dcef521d262c8c712a2ddbb9b1625e1 Mon Sep 17 00:00:00 2001 From: Sumit Jaiswal Date: Tue, 21 May 2019 06:47:04 +0530 Subject: [PATCH] Backport PR for fixing NIOS_ZONE module idempotency (#56347) * To fix the issue where nios_zone module was running second time for same object (#55595) * fix for 55128 issue Signed-off-by: Sumit Jaiswal * review comment fix Signed-off-by: Sumit Jaiswal (cherry picked from commit 661f7be0fe5acea3901b13691bef68467521aec2) * changelog for 2.8 Signed-off-by: Sumit Jaiswal --- changelogs/fragments/55595-nios-zone-idempotency-fix.yaml | 2 ++ lib/ansible/module_utils/net_tools/nios/api.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/55595-nios-zone-idempotency-fix.yaml diff --git a/changelogs/fragments/55595-nios-zone-idempotency-fix.yaml b/changelogs/fragments/55595-nios-zone-idempotency-fix.yaml new file mode 100644 index 00000000000..dfa8bd2dca2 --- /dev/null +++ b/changelogs/fragments/55595-nios-zone-idempotency-fix.yaml @@ -0,0 +1,2 @@ +bugfixes: +- To fix the nios_zone module idempotency failure - https://github.com/ansible/ansible/pull/55595 diff --git a/lib/ansible/module_utils/net_tools/nios/api.py b/lib/ansible/module_utils/net_tools/nios/api.py index 056a16138ad..bf4a061b1c3 100644 --- a/lib/ansible/module_utils/net_tools/nios/api.py +++ b/lib/ansible/module_utils/net_tools/nios/api.py @@ -447,8 +447,8 @@ class WapiModule(WapiBase): temp = ib_spec['restart_if_needed'] del ib_spec['restart_if_needed'] ib_obj = self.get_object(ib_obj_type, obj_filter.copy(), return_fields=ib_spec.keys()) - # reinstate restart_if_needed key if it's set to true in play - if module.params['restart_if_needed']: + # reinstate restart_if_needed if ib_obj is none, meaning there's no existing nios_zone ref + if not ib_obj: ib_spec['restart_if_needed'] = temp elif (ib_obj_type == NIOS_MEMBER): # del key 'create_token' as nios_member get_object fails with the key present