Skip to content

Commit

Permalink
[ironic] Move image verification to agent
Browse files Browse the repository at this point in the history
The ironic-python-agent gets some config values over the
lookup api as 'config' in the json.
And two values are unintuitively taken from the conductor config
section.
So, we have to set them in the api node as well, in order to have the
settings take hold in the agent.

With a current ironic-python-agent, we do not need to validate then
in the conductor itself.
  • Loading branch information
fwiesel committed Dec 19, 2024
1 parent 21f98fc commit 9959032
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
12 changes: 12 additions & 0 deletions openstack/ironic/templates/etc/_ironic.conf.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -132,3 +132,15 @@ metrics_enabled = {{ if .Values.audit.metrics_enabled -}}True{{- else -}}False{{
{{- include "osprofiler" . }}
{{- include "ini_sections.cache" . }}
{{- if or .Values.conductor.defaults.conductor.permitted_image_formats .Values.conductor.defaults.conductor.disable_deep_image_inspection }}
[conductor]
{{- if .Values.conductor.defaults.conductor.disable_deep_image_inspection }}
disable_deep_image_inspection = {{ .Values.conductor.defaults.conductor.disable_deep_image_inspection }}
{{- end }}
{{- if .Values.conductor.defaults.conductor.permitted_image_formats }}
permitted_image_formats = {{ .Values.conductor.defaults.conductor.permitted_image_formats }}
{{- end }}
{{- end }}
1 change: 1 addition & 0 deletions openstack/ironic/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ conductor:
redfish:
swift_object_expiry_timeout: "5400"
conductor:
conductor_always_validates_images: False # We only use the direct interface, so leave it to the agent
permitted_image_formats: 'raw,qcow2,iso,vmdk'

agent:
Expand Down

0 comments on commit 9959032

Please sign in to comment.