openstack/openstack-ansible-os_keystone
Code Issues Proposed changes

Remove excessive bindings for uWSGI

Browse Source 
For scenario where keystone_use_uwsgi is False and Apache is being used
as a proxy, it does not make sense to have a binding on HTTP port as
only socket binding is being used by Apache. And vice-versa, when
keystone_use_uwsgi is enabled only socket binding is being used

Change-Id: I07d22c35b0952a42cbb72657fabfa8490a50b896
This commit is contained in:
Dmitriy Rabotyagov 2024-07-25 16:56:09 +02:00
parent 09c41fab99
commit 95641cbd26
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
defaults/main.yml
View File

@ -251,7 +251,6 @@ keystone_uwsgi_bind_address: "{{ openstack_service_bind_address | default('0.0.0
keystone_uwsgi_ports: keystone_uwsgi_ports:
keystone-wsgi-public: keystone-wsgi-public:
http: 37358
socket: 35358 socket: 35358
keystone_uwsgi_ini_overrides: {} keystone_uwsgi_ini_overrides: {}
@ -639,9 +638,15 @@ keystone_services:
group: keystone_all group: keystone_all
wsgi_app: True wsgi_app: True
wsgi_path: "{{ keystone_bin }}/keystone-wsgi-public" wsgi_path: "{{ keystone_bin }}/keystone-wsgi-public"
uwsgi_overrides: "{{ keystone_default_uwsgi_overrides | combine(keystone_uwsgi_ini_overrides, recursive=True) }}" uwsgi_overrides: >-
uwsgi_bind_address: "{{ keystone_uwsgi_bind_address }}" {{
uwsgi_port: "{{ (keystone_use_uwsgi | bool) | ternary(keystone_service_port, keystone_uwsgi_ports['keystone-wsgi-public']['http']) }}" (keystone_use_uwsgi | bool) | ternary(
keystone_default_uwsgi_overrides,
keystone_default_uwsgi_overrides | combine(keystone_uwsgi_ini_overrides, recursive=True)
)
}}
uwsgi_bind_address: "{{ (keystone_use_uwsgi | bool) | ternary(keystone_uwsgi_bind_address, []) }}"
uwsgi_port: "{{ (keystone_use_uwsgi | bool) | ternary(keystone_service_port, '') }}"
## Extra HTTP headers for Keystone ## Extra HTTP headers for Keystone
# Add any additional headers here that Keystone should return. # Add any additional headers here that Keystone should return.

5
handlers/main.yml
View File

@ -72,11 +72,10 @@
- name: Wait for uWSGI socket to be ready - name: Wait for uWSGI socket to be ready
wait_for: wait_for:
port: "{{ item }}" host: "{{ (keystone_use_uwsgi | bool) | ternary(keystone_uwsgi_bind_address, '127.0.0.1') }}"
port: "{{ (keystone_use_uwsgi | bool) | ternary(keystone_service_port, keystone_uwsgi_ports['keystone-wsgi-public']['socket']) }}"
timeout: 25 timeout: 25
delay: 10 delay: 10
with_items:
- "{{ keystone_uwsgi_ports['keystone-wsgi-public']['socket'] }}"
register: _wait_check register: _wait_check
until: _wait_check is success until: _wait_check is success
retries: 5 retries: 5