openstack
/
ironic
Code Issues Proposed changes

Merge "Fix inspection for idrac" into stable/victoria

This commit is contained in:
Zuul 2020-10-12 00:50:37 +00:00 committed by Gerrit Code Review
parent 9b6e996d25 dabb756b5f
commit 98c83c0d50
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ironic/drivers/modules/image_utils.py
View File

@ -46,6 +46,14 @@ class ImageHandler(object):
"file_permission": CONF.redfish.file_permission,
"kernel_params": CONF.redfish.kernel_append_params
},
"idrac": {
"swift_enabled": CONF.redfish.use_swift,
"container": CONF.redfish.swift_container,
"timeout": CONF.redfish.swift_object_expiry_timeout,
"image_subdir": "redfish",
"file_permission": CONF.redfish.file_permission,
"kernel_params": CONF.redfish.kernel_append_params
},
"ilo5": {
"swift_enabled": not CONF.ilo.use_web_server_for_images,
"container": CONF.ilo.swift_ilo_container,

4
releasenotes/notes/fix-inspection-for-idrac-34b3ea09452af8be.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- |
Fix an issue when using idrac with vmedia and trying to inspect a node.