Skip to content

Commit

Permalink
Fix keystone configuration for haproxy.
Browse files Browse the repository at this point in the history
* Use proper balancing mode when federation is enabled.

Closes-Bug: #2058656
Change-Id: Ia81a6efc38ec2bdc1355d058c03568cf740fdac5
(cherry picked from commit 33d03a4)
  • Loading branch information
gtherond authored and artificial-intelligence committed Jul 29, 2024
1 parent f78dab4 commit 73496e1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
8 changes: 6 additions & 2 deletions ansible/roles/keystone/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,17 @@ keystone_services:
tls_backend: "{{ keystone_enable_tls_backend }}"
port: "{{ keystone_public_port }}"
listen_port: "{{ keystone_public_listen_port }}"
backend_http_extra: "{{ ['balance source'] if enable_keystone_federation | bool else [] }}"
backend_http_extra:
- balance "{{ 'source' if enable_keystone_federation | bool else 'roundrobin' }}"
keystone_external:
enabled: "{{ enable_keystone }}"
mode: "http"
external: true
tls_backend: "{{ keystone_enable_tls_backend }}"
port: "{{ keystone_public_port }}"
listen_port: "{{ keystone_public_listen_port }}"
backend_http_extra: "{{ ['balance source'] if enable_keystone_federation | bool else [] }}"
backend_http_extra:
- balance "{{ 'source' if enable_keystone_federation | bool else 'roundrobin' }}"
# NOTE(yoctozepto): Admin port settings are kept only for upgrade compatibility.
# TODO(yoctozepto): Remove after Zed.
keystone_admin:
Expand All @@ -34,6 +36,8 @@ keystone_services:
tls_backend: "{{ keystone_enable_tls_backend }}"
port: "{{ keystone_admin_port }}"
listen_port: "{{ keystone_admin_listen_port }}"
backend_http_extra:
- balance "{{ 'source' if enable_keystone_federation | bool else 'roundrobin' }}"
keystone-ssh:
container_name: "keystone_ssh"
group: "keystone"
Expand Down
5 changes: 5 additions & 0 deletions releasenotes/notes/bug-2058656-ad68bb260327a267.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
fixes:
- |
Fixes keystone service configuration for haproxy when using federation.
`LP#2058656 <https://bugs.launchpad.net/kolla-ansible/+bug/2058656>`__

0 comments on commit 73496e1

Please sign in to comment.