From f51f87a986b54329e731e3cccb16049011009cb1 Mon Sep 17 00:00:00 2001 From: Bill Dodd Date: Wed, 20 Nov 2019 14:03:19 -0600 Subject: [PATCH] DeleteUser: do not disable user if already disabled (#64797) * DeleteUser: do not disable user if already disabled * add changelog fragment --- .../fragments/64797-fix-error-deleting-redfish-acct.yaml | 3 +++ lib/ansible/module_utils/redfish_utils.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/64797-fix-error-deleting-redfish-acct.yaml diff --git a/changelogs/fragments/64797-fix-error-deleting-redfish-acct.yaml b/changelogs/fragments/64797-fix-error-deleting-redfish-acct.yaml new file mode 100644 index 00000000000..ed306a8c204 --- /dev/null +++ b/changelogs/fragments/64797-fix-error-deleting-redfish-acct.yaml @@ -0,0 +1,3 @@ +--- +bugfixes: + - redfish_command - fix error when deleting a disabled Redfish account (https://github.com/ansible/ansible/issues/64684) diff --git a/lib/ansible/module_utils/redfish_utils.py b/lib/ansible/module_utils/redfish_utils.py index 97bbf30d7de..77f09772276 100644 --- a/lib/ansible/module_utils/redfish_utils.py +++ b/lib/ansible/module_utils/redfish_utils.py @@ -991,7 +991,7 @@ class RedfishUtils(object): return {'ret': True, 'changed': False} payload = {'UserName': ''} - if 'Enabled' in data: + if data.get('Enabled', False): payload['Enabled'] = False response = self.patch_request(self.root_uri + uri, payload) if response['ret'] is False: