Skip to content
Snippets Groups Projects
Commit 170ebad1 authored by Mark Goddard's avatar Mark Goddard
Browse files

Fix use of IPA images in Bifrost without a checksum

Ironic now provides DIB-built CentOS images at
https://tarballs.openstack.org/ironic-python-agent/dib/files. However,
if Bifrost is configured to use these, then the 'kayobe seed service
deploy' command fails because the checksum files are not available.

This change fixes the issue by allowing
'kolla_bifrost_ipa_kernel_checksum_url' and
'kolla_bifrost_ipa_ramdisk_checksum_url' to be overridden to empty
strings, indicating that there is no checksum.

Very similar to the issue fixed in https://review.opendev.org/688359 for
the overcloud.

Change-Id: If73cebb95c7d0596dc8087112fc19398a113f0cc
Story: 2006715
Task: 37407
parent a02c6583
No related branches found
No related tags found
No related merge requests found
...@@ -40,35 +40,23 @@ inspector_extra_kernel_options: "{{ kolla_bifrost_inspector_extra_kernel_options ...@@ -40,35 +40,23 @@ inspector_extra_kernel_options: "{{ kolla_bifrost_inspector_extra_kernel_options
# Whether to download Ironic Python Agent (IPA) images. # Whether to download Ironic Python Agent (IPA) images.
download_ipa: "{{ kolla_bifrost_download_ipa }}" download_ipa: "{{ kolla_bifrost_download_ipa }}"
{% if kolla_bifrost_ipa_kernel_upstream_url %}
# URL of Ironic Python Agent (IPA) kernel image. # URL of Ironic Python Agent (IPA) kernel image.
ipa_kernel_upstream_url: "{{ kolla_bifrost_ipa_kernel_upstream_url }}" ipa_kernel_upstream_url: "{{ kolla_bifrost_ipa_kernel_upstream_url }}"
{% endif %}
{% if kolla_bifrost_ipa_kernel_checksum_url %}
# URL of checksum of Ironic Python Agent (IPA) kernel image. # URL of checksum of Ironic Python Agent (IPA) kernel image.
ipa_kernel_upstream_checksum_url: "{{ kolla_bifrost_ipa_kernel_checksum_url }}" ipa_kernel_upstream_checksum_url: "{{ kolla_bifrost_ipa_kernel_checksum_url }}"
{% endif %}
{% if kolla_bifrost_ipa_kernel_checksum_algorithm %}
# Algorithm of checksum of Ironic Python Agent (IPA) kernel image. # Algorithm of checksum of Ironic Python Agent (IPA) kernel image.
ipa_kernel_upstream_checksum_algo: "{{ kolla_bifrost_ipa_kernel_checksum_algorithm }}" ipa_kernel_upstream_checksum_algo: "{{ kolla_bifrost_ipa_kernel_checksum_algorithm }}"
{% endif %}
{% if kolla_bifrost_ipa_ramdisk_upstream_url %}
# URL of Ironic Python Agent (IPA) ramdisk image. # URL of Ironic Python Agent (IPA) ramdisk image.
ipa_ramdisk_upstream_url: "{{ kolla_bifrost_ipa_ramdisk_upstream_url }}" ipa_ramdisk_upstream_url: "{{ kolla_bifrost_ipa_ramdisk_upstream_url }}"
{% endif %}
{% if kolla_bifrost_ipa_ramdisk_checksum_url %}
# URL of checksum of Ironic Python Agent (IPA) ramdisk image. # URL of checksum of Ironic Python Agent (IPA) ramdisk image.
ipa_ramdisk_upstream_checksum_url: "{{ kolla_bifrost_ipa_ramdisk_checksum_url }}" ipa_ramdisk_upstream_checksum_url: "{{ kolla_bifrost_ipa_ramdisk_checksum_url }}"
{% endif %}
{% if kolla_bifrost_ipa_ramdisk_checksum_algorithm %}
# Algorithm of checksum of Ironic Python Agent (IPA) ramdisk image. # Algorithm of checksum of Ironic Python Agent (IPA) ramdisk image.
ipa_ramdisk_upstream_checksum_algo: "{{ kolla_bifrost_ipa_ramdisk_checksum_algorithm }}" ipa_ramdisk_upstream_checksum_algo: "{{ kolla_bifrost_ipa_ramdisk_checksum_algorithm }}"
{% endif %}
{% if kolla_bifrost_extra_globals %} {% if kolla_bifrost_extra_globals %}
############################################################################### ###############################################################################
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment