Skip to content

Commit 53ea2da

Browse files
authored
Merge pull request #189 from stackhpc/remove-bifrost-workarounds
Remove Bifrost configuration workarounds
2 parents 65a29db + 9b72461 commit 53ea2da

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

etc/kayobe/kolla/config/bifrost/bifrost.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,5 @@ download_ipa: true
55

66
# Use a locally hosted cloud image.
77
download_custom_deploy_image: true
8-
{% if os_distribution == 'ubuntu' and os_release == 'noble' %}
9-
# TODO(priteau): Remove once
10-
# https://review.opendev.org/c/openstack/bifrost/+/934177 is merged.
11-
custom_deploy_image_upstream_url: "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img"
12-
custom_deploy_image_checksum_url: "https://cloud-images.ubuntu.com/noble/current/SHA256SUMS"
13-
custom_deploy_image_checksum_algorithm: "sha256"
14-
{% else %}
158
upstream_deploy_image_distribution: "{{ os_distribution }}"
169
upstream_deploy_image_release: "{{ os_release }}"
17-
{% endif %}
18-
19-
# TODO(priteau): Remove once https://bugs.launchpad.net/bifrost/+bug/2081031 is
20-
# resolved.
21-
{% if os_distribution in ['centos', 'rocky'] %}
22-
custom_deploy_image_checksum_algorithm: "none"
23-
{% endif %}

0 commit comments

Comments
 (0)