Browse Source

Merge "Validation should use the public endpoint"

changes/43/755243/4
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
d12ceec5bd
2 changed files with 8 additions and 8 deletions
  1. +6
    -6
      roles/overcloud_service_status/resources/scripts/http_server.py
  2. +2
    -2
      roles/overcloud_service_status/tasks/os_service.yml

+ 6
- 6
roles/overcloud_service_status/resources/scripts/http_server.py View File

@ -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",


+ 2
- 2
roles/overcloud_service_status/tasks/os_service.yml View File

@ -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