ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Redfish: Do not set the boot source override mode if not provided by the user (#3581) (#3595)

Browse source 
* Redfish: Do not set the boot source override mode if not provided by the user

Signed-off-by: Mike Raineri <michael.raineri@dell.com>

* Corrected changelog file extension

Signed-off-by: Mike Raineri <michael.raineri@dell.com>

* Update changelogs/fragments/3509-redfish_utils-SetOneTimeBoot-mode-fix.yml

Co-authored-by: Felix Fontein <felix@fontein.de>

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 481fc48e51)

Co-authored-by: Mike Raineri <michael.raineri@dell.com>
This commit is contained in:
patchback[bot] 2021-10-22 07:41:09 +02:00 committed by GitHub
parent 786ea68016
commit ad4efaeb31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/3509-redfish_utils-SetOneTimeBoot-mode-fix.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- redfish_utils module utils - do not attempt to change the boot source override mode if not specified by the user (https://github.com/ansible-collections/community.general/issues/3509/).

9
plugins/module_utils/redfish_utils.py
View file

@ -1605,9 +1605,6 @@ class RedfishUtils(object):
cur_boot_next = boot.get('BootNext') cur_boot_next = boot.get('BootNext')
cur_override_mode = boot.get('BootSourceOverrideMode') cur_override_mode = boot.get('BootSourceOverrideMode')
if not boot_override_mode:
boot_override_mode = cur_override_mode
if override_enabled == 'Disabled': if override_enabled == 'Disabled':
payload = { payload = {
'Boot': { 'Boot': {
@ -1643,16 +1640,18 @@ class RedfishUtils(object):
} }
} }
else: else:
if cur_enabled == override_enabled and target == bootdevice and cur_override_mode == boot_override_mode: if (cur_enabled == override_enabled and target == bootdevice and
(cur_override_mode == boot_override_mode or not boot_override_mode)):
# If properties are already set, no changes needed # If properties are already set, no changes needed
return {'ret': True, 'changed': False} return {'ret': True, 'changed': False}
payload = { payload = {
'Boot': { 'Boot': {
'BootSourceOverrideEnabled': override_enabled, 'BootSourceOverrideEnabled': override_enabled,
'BootSourceOverrideMode': boot_override_mode,
'BootSourceOverrideTarget': bootdevice 'BootSourceOverrideTarget': bootdevice
} }
} }
if boot_override_mode:
payload['Boot']['BootSourceOverrideMode'] = boot_override_mode
response = self.patch_request(self.root_uri + self.systems_uri, payload) response = self.patch_request(self.root_uri + self.systems_uri, payload)
if response['ret'] is False: if response['ret'] is False: