Skip to content

Commit

Permalink
Merge "Fix inspection for idrac"
Browse files Browse the repository at this point in the history
  • Loading branch information
Zuul authored and openstack-gerrit committed Oct 4, 2020
2 parents eac7226 + db55700 commit a44118c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
8 changes: 8 additions & 0 deletions ironic/drivers/modules/image_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
fixes:
- |
Fix an issue when using idrac with vmedia and trying to inspect a node.

0 comments on commit a44118c

Please sign in to comment.