Merge "Remove workaround for installing Ussuri and older"

This commit is contained in:
Zuul 2025-02-12 22:32:01 +00:00 committed by Gerrit Code Review
commit 91fd63a7ca
2 changed files with 0 additions and 9 deletions

View File

@ -327,13 +327,6 @@ ansible_python_interpreter: "{{ bifrost_venv_dir + '/bin/python3' }}"
# conditional statements in the playbooks.
noauth_mode: false
# A work around for installing older releases, remove when no longer supporting
# Ussuri.
git_branch: master
supports_http_auth: >-
{{ git_branch == "master"
or git_branch[7:] not in ["queens", "rocky", "stein", "train", "ussuri"] }}
# Keystone Support
# Default parameter if keystone is enabled, or disabled.
enable_keystone: false

View File

@ -236,8 +236,6 @@ username = {{ ironic.service_catalog.username }}
password = {{ ironic.service_catalog.password }}
user_domain_id = default
project_domain_id = default
{% elif not supports_http_auth | bool %}
auth_strategy = noauth
{% else %}
auth_strategy = http_basic
auth_type = http_basic