From 07ffeb147a59593517dbe15116e40c4ad77413ad Mon Sep 17 00:00:00 2001
From: David Vallee Delisle <dvd@redhat.com>
Date: Tue, 27 Apr 2021 15:11:16 -0400
Subject: [PATCH] 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

Conflict:
  roles/overcloud_service_status/resources/scripts/http_server.py

NOTE(dvd): Train supports python2 so the url formatting is a bit
different.

Change-Id: I2cf2280e4a4599f60c0cce550358f9cf3a20f802
(cherry picked from commit 7e5f0acbe2ed630e3a251c2db74a88833a9fa07f)
(cherry picked from commit d7b344b5d1caf55d9c34bc8cf813463f2de2e3d7)
(cherry picked from commit 55dad79081a88c309308dc85e585944aff83ea38)
---
 .../resources/scripts/http_server.py                 | 12 ++++++------
 roles/overcloud_service_status/tasks/os_service.yml  |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/roles/overcloud_service_status/resources/scripts/http_server.py b/roles/overcloud_service_status/resources/scripts/http_server.py
index ed5877fda..11b6e789d 100644
--- a/roles/overcloud_service_status/resources/scripts/http_server.py
+++ b/roles/overcloud_service_status/resources/scripts/http_server.py
@@ -125,15 +125,15 @@ class S(BaseHTTPRequestHandler):
                         "endpoints": [
                             {
                                 "url": cinder_url,
-                                "interface": "admin",
+                                "interface": "public",
                             },
                             {
                                 "url": cinder_url,
-                                "interface": "admin",
+                                "interface": "public",
                             },
                             {
                                 "url": cinder_url,
-                                "interface": "admin",
+                                "interface": "public",
                             },
                         ],
                         "name": "cinderv3",
@@ -142,15 +142,15 @@ class S(BaseHTTPRequestHandler):
                         "endpoints": [
                             {
                                 "url": nova_url,
-                                "interface": "admin",
+                                "interface": "public",
                             },
                             {
                                 "url": nova_url,
-                                "interface": "admin",
+                                "interface": "public",
                             },
                             {
                                 "url": nova_url,
-                                "interface": "admin",
+                                "interface": "public",
                             },
                         ],
                         "name": "nova",
diff --git a/roles/overcloud_service_status/tasks/os_service.yml b/roles/overcloud_service_status/tasks/os_service.yml
index 8fbd58089..341ee143b 100644
--- a/roles/overcloud_service_status/tasks/os_service.yml
+++ b/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