diff options
5 files changed, 9 insertions, 51 deletions
diff --git a/ansible/roles/keystone/templates/httpd-keystone.conf.j2 b/ansible/roles/keystone/templates/httpd-keystone.conf.j2 index 6d4692367..2d5bfb848 100644 --- a/ansible/roles/keystone/templates/httpd-keystone.conf.j2 +++ b/ansible/roles/keystone/templates/httpd-keystone.conf.j2 @@ -53,7 +53,7 @@ LogLevel info {% if keystone_enable_federation_openid | bool %} {% if keystone_federation_oidc_forwarded_headers | length > 0 %} - OIDCXForwardedHeaders "{{ keystone_federation_oidc_forwarded_headers }}" + OIDCXForwardedHeaders {{ keystone_federation_oidc_forwarded_headers }} {% endif %} OIDCClaimPrefix "OIDC-" OIDCClaimDelimiter "{{ keystone_federation_oidc_claim_delimiter }}" diff --git a/ansible/roles/opensearch/handlers/main.yml b/ansible/roles/opensearch/handlers/main.yml index 361d9fcf2..0a279a9b0 100644 --- a/ansible/roles/opensearch/handlers/main.yml +++ b/ansible/roles/opensearch/handlers/main.yml @@ -57,29 +57,6 @@ dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" -- name: Wait for OpenSearch cluster to recover - become: true - kolla_toolbox: - container_engine: "{{ kolla_container_engine }}" - module_name: uri - module_args: - url: "{{ opensearch_internal_endpoint }}/_cluster/health?wait_for_status=yellow&timeout=30s" - timeout: 35 - status_code: 200 - validate_certs: "{{ kolla_enable_tls_internal | bool }}" - return_content: true - body_format: json - ca_path: "{{ openstack_cacert }}" - delegate_to: "{{ groups['opensearch'][0] }}" - run_once: true - retries: 60 - delay: 5 - register: result - until: result.get('status') == 200 - listen: "Restart opensearch container" - when: - - kolla_action != "config" - - name: Restart opensearch-dashboards container vars: service_name: "opensearch-dashboards" diff --git a/ansible/roles/opensearch/tasks/post-config.yml b/ansible/roles/opensearch/tasks/post-config.yml index deef86b9f..290e88365 100644 --- a/ansible/roles/opensearch/tasks/post-config.yml +++ b/ansible/roles/opensearch/tasks/post-config.yml @@ -88,27 +88,6 @@ - not ansible_check_mode - opensearch_retention_policy_check.status == 404 -- name: Wait for OpenSearch Dashboards API to become ready - become: true - kolla_toolbox: - container_engine: "{{ kolla_container_engine }}" - module_name: uri - module_args: - url: "{{ opensearch_dashboards_internal_endpoint }}/api/status" - method: GET - status_code: 200 - url_username: "{{ opensearch_dashboards_user }}" - url_password: "{{ opensearch_dashboards_password }}" - force_basic_auth: true - ca_path: "{{ openstack_cacert }}" - register: result - until: result.get('status') == 200 - retries: 30 - delay: 10 - delegate_to: "{{ groups['opensearch'][0] }}" - run_once: true - when: not ansible_check_mode - - name: Create OpenSearch Dashboards Index Pattern become: true kolla_toolbox: diff --git a/releasenotes/notes/bug-2161333-aeaa498fccaadf51.yaml b/releasenotes/notes/bug-2161333-aeaa498fccaadf51.yaml deleted file mode 100644 index 226c5a8eb..000000000 --- a/releasenotes/notes/bug-2161333-aeaa498fccaadf51.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -fixes: - - | - Fixes OpenSearch 503 errors on Create OpenSearch Dashboards Index Pattern - task during service upgrade. - `LP#2161333 <https://launchpad.net/bugs/2161333>`__ diff --git a/releasenotes/notes/fix-oidc-forwarded-headers-2b3b670e3732ca86.yaml b/releasenotes/notes/fix-oidc-forwarded-headers-2b3b670e3732ca86.yaml new file mode 100644 index 000000000..ef3fc14e2 --- /dev/null +++ b/releasenotes/notes/fix-oidc-forwarded-headers-2b3b670e3732ca86.yaml @@ -0,0 +1,8 @@ +--- +fixes: + - | + Fixes the ``OIDCXForwardedHeaders`` directive in the Keystone Apache + configuration. The value was previously wrapped in double quotes, which + caused Apache to treat the whole list as a single argument and prevented + configuring more than one forwarded header. See `LP#2155147 + <https://bugs.launchpad.net/kolla-ansible/+bug/2155147>`__. |