Browse Source

Validation should use the public endpoint

It was erroneous to use the admin endpoint as it's not accessible from
the undercloud anymore.

Related: https://bugzilla.redhat.com/show_bug.cgi?id=1921114
Change-Id: I2cf2280e4a4599f60c0cce550358f9cf3a20f802
(cherry picked from commit 7e5f0acbe2)
changes/67/788767/1
David Vallee Delisle 7 months ago
parent
commit
d7b344b5d1
  1. 12
      roles/overcloud_service_status/resources/scripts/http_server.py
  2. 4
      roles/overcloud_service_status/tasks/os_service.yml

12
roles/overcloud_service_status/resources/scripts/http_server.py

@ -123,15 +123,15 @@ class S(BaseHTTPRequestHandler):
"endpoints": [
{
"url": f"{server_url}:{server_port}/cinder",
"interface": "admin",
"interface": "public",
},
{
"url": f"{server_url}:{server_port}/cinder",
"interface": "admin",
"interface": "public",
},
{
"url": f"{server_url}:{server_port}/cinder",
"interface": "admin",
"interface": "public",
},
],
"name": "cinderv3",
@ -140,15 +140,15 @@ class S(BaseHTTPRequestHandler):
"endpoints": [
{
"url": f"{server_url}:{server_port}/nova",
"interface": "admin",
"interface": "public",
},
{
"url": f"{server_url}:{server_port}/nova",
"interface": "admin",
"interface": "public",
},
{
"url": f"{server_url}:{server_port}/nova",
"interface": "admin",
"interface": "public",
},
],
"name": "nova",

4
roles/overcloud_service_status/tasks/os_service.yml

@ -16,14 +16,14 @@
- name: Extracting the endpoint url
set_fact:
endpoint: "{{ catalog.endpoints|selectattr('interface', 'eq', 'admin')|first }}"
endpoint: "{{ catalog.endpoints|selectattr('interface', 'eq', 'public')|first }}"
loop: "{{ auth_token.json.token.catalog }}"
loop_control:
loop_var: catalog
when: catalog.name == os_service
- fail:
msg: "No endpoint found for {{ os_service }} interface admin in catalog"
msg: "No endpoint found for {{ os_service }} interface public in catalog"
when: endpoint is not defined
- name: Get services

Loading…
Cancel
Save