Skip to content

Commit 27011e0

Browse files
committed
Remove workaround for installing Ussuri and older
This reverts commit cd3fcaf. Change-Id: I4420680d1e4d962a5a1baa2af1f26df0db37c3bb
1 parent 76f82ac commit 27011e0

File tree

2 files changed

+0
-9
lines changed

2 files changed

+0
-9
lines changed

playbooks/roles/bifrost-ironic-install/defaults/main.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -323,13 +323,6 @@ ansible_python_interpreter: "{{ bifrost_venv_dir + '/bin/python3' }}"
323323
# conditional statements in the playbooks.
324324
noauth_mode: false
325325

326-
# A work around for installing older releases, remove when no longer supporting
327-
# Ussuri.
328-
git_branch: master
329-
supports_http_auth: >-
330-
{{ git_branch == "master"
331-
or git_branch[7:] not in ["queens", "rocky", "stein", "train", "ussuri"] }}
332-
333326
# Keystone Support
334327
# Default parameter if keystone is enabled, or disabled.
335328
enable_keystone: false

playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,6 @@ username = {{ ironic.service_catalog.username }}
236236
password = {{ ironic.service_catalog.password }}
237237
user_domain_id = default
238238
project_domain_id = default
239-
{% elif not supports_http_auth | bool %}
240-
auth_strategy = noauth
241239
{% else %}
242240
auth_strategy = http_basic
243241
auth_type = http_basic

0 commit comments

Comments
 (0)