diff options
| author | Zuul <zuul@review.opendev.org> | 2020-10-12 00:50:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-10-12 00:50:37 +0000 |
| commit | 98c83c0d50e7a2cf09018030d35ee76d652dea03 (patch) | |
| tree | 9326e8c9e6398cab0ceaff34a657af895d3eb7eb | |
| parent | 9b6e996d258d4420f6ae8353e7a75468e0e284ce (diff) | |
| parent | dabb756b5f3737a6ce575b9f2db44da1dcf6b30e (diff) | |
| download | ironic-98c83c0d50e7a2cf09018030d35ee76d652dea03.tar.gz | |
Merge "Fix inspection for idrac" into stable/victoria16.0.1
| -rw-r--r-- | ironic/drivers/modules/image_utils.py | 8 | ||||
| -rw-r--r-- | releasenotes/notes/fix-inspection-for-idrac-34b3ea09452af8be.yaml | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/ironic/drivers/modules/image_utils.py b/ironic/drivers/modules/image_utils.py index ce87adc93..1320b15e0 100644 --- a/ironic/drivers/modules/image_utils.py +++ b/ironic/drivers/modules/image_utils.py @@ -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, diff --git a/releasenotes/notes/fix-inspection-for-idrac-34b3ea09452af8be.yaml b/releasenotes/notes/fix-inspection-for-idrac-34b3ea09452af8be.yaml new file mode 100644 index 000000000..c790f3248 --- /dev/null +++ b/releasenotes/notes/fix-inspection-for-idrac-34b3ea09452af8be.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + Fix an issue when using idrac with vmedia and trying to inspect a node. |