From 2c0f94a868ce712a7b13ac1755f20a5cdc950535 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Thu, 25 Apr 2024 10:03:47 +0200 Subject: [PATCH] kolla_url: port is a string Ansible passes port as a string - therefore matching does not work and we get https://nova_url:443/v2.1 Closes-Bug: #2063434 Change-Id: I76cce7f491c77b6b788d29c8644e87055f5cfff0 --- kolla_ansible/kolla_url.py | 1 + zuul.d/base.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/kolla_ansible/kolla_url.py b/kolla_ansible/kolla_url.py index 36e516051b..a217491e6f 100644 --- a/kolla_ansible/kolla_url.py +++ b/kolla_ansible/kolla_url.py @@ -28,6 +28,7 @@ def kolla_url(fqdn, protocol, port, path='', context='url'): """ fqdn = put_address_in_context(fqdn, context) + port = int(port) if ((protocol == 'http' and port == 80) or (protocol == 'https' and port == 443) or diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index e875c69a63..03a20f7eda 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -288,6 +288,7 @@ voting: false files: - ^ansible/roles/haproxy/ + - ^kolla_ansible/kolla_url.py vars: external_api_interface_name: vxlan2 external_api_network_prefix: "192.0.3."