openstack/bifrost
Code Issues Proposed changes

Recover support for installing stable/ussuri

Browse Source 
While not encouraged, it's sometimes requested. This change checks
git_branch and avoids http_basic with JSON RPC.

Story: #2008151
Task: #40896
Change-Id: I38b55e060fe363e2e6f569f10b6d6aab6cb8d12c
This commit is contained in:
Dmitry Tantsur 2020-09-16 17:50:21 +02:00
parent c0b5914d17
commit cd3fcafbbe
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
playbooks/roles/bifrost-ironic-install/defaults/main.yml
View File

@ -253,6 +253,13 @@ ansible_python_interpreter: "{{ bifrost_venv_dir + '/bin/python3' }}"
# conditional statements in the playbooks. # conditional statements in the playbooks.
noauth_mode: true noauth_mode: true
# 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 # Keystone Support
# Default parameter if keystone is enabled, or disabled. # Default parameter if keystone is enabled, or disabled.
enable_keystone: false enable_keystone: false

2
playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
View File

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