Merge "Fix Skyline nginx service proxy paths" into stable/2026.1

1 files changed, 17 insertions, 17 deletions

diff --git a/ansible/roles/skyline/templates/nginx.conf.j2 b/ansible/roles/skyline/templates/nginx.conf.j2
index 221323ed2..23b0fbebc 100644
--- a/ansible/roles/skyline/templates/nginx.conf.j2
+++ b/ansible/roles/skyline/templates/nginx.conf.j2
@@ -103,7 +103,7 @@ http {
         }
 
         {% if enable_keystone | bool %}# Region: {{ openstack_region_name }}, Service: keystone
-        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/keystone {
+        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/keystone/ {
             proxy_pass {{ internal_protocol }}://{{ keystone_internal_fqdn | put_address_in_context('url') }}:{{ keystone_internal_port }}/;
             proxy_redirect {{ internal_protocol }}://{{ keystone_internal_fqdn | put_address_in_context('url') }}:{{ keystone_internal_port }}/ {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/keystone/;
             proxy_buffering off;
@@ -115,7 +115,7 @@ http {
         {% endif %}
 
         {% if enable_glance | bool %}# Region: {{ openstack_region_name }}, Service: glance
-        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/glance {
+        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/glance/ {
             proxy_pass {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ glance_api_port }}/;
             proxy_redirect {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ glance_api_port }}/ {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/glance/;
             proxy_buffering off;
@@ -127,7 +127,7 @@ http {
         {% endif %}
 
         {% if enable_neutron | bool %}# Region: {{ openstack_region_name }}, Service: neutron
-        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/neutron {
+        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/neutron/ {
             proxy_pass {{ internal_protocol }}://{{ neutron_internal_fqdn | put_address_in_context('url') }}:{{ neutron_server_port }}/;
             proxy_redirect {{ internal_protocol }}://{{ neutron_internal_fqdn | put_address_in_context('url') }}:{{ neutron_server_port }}/ {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/neutron/;
             proxy_buffering off;
@@ -139,7 +139,7 @@ http {
         {% endif %}
 
         {% if enable_nova | bool %}# Region: {{ openstack_region_name }}, Service: nova
-        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/nova {
+        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/nova/ {
             proxy_pass {{ internal_protocol }}://{{ nova_internal_fqdn | put_address_in_context('url') }}:{{ nova_api_port }}/;
             proxy_redirect {{ internal_protocol }}://{{ nova_internal_fqdn | put_address_in_context('url') }}:{{ nova_api_port }}/ {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/nova/;
             proxy_buffering off;
@@ -151,7 +151,7 @@ http {
         {% endif %}
 
         {% if enable_placement | bool %}# Region: {{ openstack_region_name }}, Service: placement
-        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/placement {
+        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/placement/ {
             proxy_pass {{ internal_protocol }}://{{ placement_internal_fqdn | put_address_in_context('url') }}:{{ placement_api_port }}/;
             proxy_redirect {{ internal_protocol }}://{{ placement_internal_fqdn | put_address_in_context('url') }}:{{ placement_api_port }}/ {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/placement/;
             proxy_buffering off;
@@ -163,7 +163,7 @@ http {
         {% endif %}
 
         {% if enable_cinder | bool %}# Region: {{ openstack_region_name }}, Service: cinder
-        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/cinder {
+        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/cinder/ {
             proxy_pass {{ internal_protocol }}://{{ cinder_internal_fqdn | put_address_in_context('url') }}:{{ cinder_api_port }}/;
             proxy_redirect {{ internal_protocol }}://{{ cinder_internal_fqdn | put_address_in_context('url') }}:{{ cinder_api_port }}/ {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/cinder/;
             proxy_buffering off;
@@ -175,7 +175,7 @@ http {
         {% endif %}
 
         {% if enable_heat | bool %}# Region: {{ openstack_region_name }}, Service: heat
-        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/heat {
+        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/heat/ {
             proxy_pass {{ internal_protocol }}://{{ heat_internal_fqdn | put_address_in_context('url') }}:{{ heat_api_port }}/;
             proxy_redirect {{ internal_protocol }}://{{ heat_internal_fqdn | put_address_in_context('url') }}:{{ heat_api_port }}/ {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/heat/;
             proxy_buffering off;
@@ -187,7 +187,7 @@ http {
         {% endif %}
 
         {% if enable_octavia | bool %}# Region: {{ openstack_region_name }}, Service: octavia
-        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/octavia {
+        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/octavia/ {
             proxy_pass {{ internal_protocol }}://{{ octavia_internal_fqdn | put_address_in_context('url') }}:{{ octavia_api_port }}/;
             proxy_redirect {{ internal_protocol }}://{{ octavia_internal_fqdn | put_address_in_context('url') }}:{{ octavia_api_port }}/ {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/octavia/;
             proxy_buffering off;
@@ -199,7 +199,7 @@ http {
         {% endif %}
 
         {% if enable_manila | bool %}# Region: {{ openstack_region_name }}, Service: manilav2
-        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/manilav2 {
+        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/manilav2/ {
             proxy_pass {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ manila_api_port }}/;
             proxy_redirect {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ manila_api_port }}/ {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/manilav2/;
             proxy_buffering off;
@@ -211,7 +211,7 @@ http {
         {% endif %}
 
         {% if enable_ironic | bool %}# Region: {{ openstack_region_name }}, Service: ironic
-        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/ironic {
+        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/ironic/ {
             proxy_pass {{ internal_protocol }}://{{ ironic_internal_fqdn | put_address_in_context('url') }}:{{ ironic_api_port }}/;
             proxy_redirect {{ internal_protocol }}://{{ ironic_internal_fqdn | put_address_in_context('url') }}:{{ ironic_api_port }}/ {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/ironic/;
             proxy_buffering off;
@@ -223,7 +223,7 @@ http {
         {% endif %}
 
         {% if enable_magnum | bool %}# Region: {{ openstack_region_name }}, Service: magnum
-        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/magnum {
+        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/magnum/ {
             proxy_pass {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ magnum_api_port }}/;
             proxy_redirect {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ magnum_api_port }}/ {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/magnum/;
             proxy_buffering off;
@@ -235,7 +235,7 @@ http {
         {% endif %}
 
         {% if enable_trove | bool %}# Region: {{ openstack_region_name }}, Service: trove
-        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/trove {
+        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/trove/ {
             proxy_pass {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ trove_api_port }}/;
             proxy_redirect {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ trove_api_port }}/ {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/trove/;
             proxy_buffering off;
@@ -247,7 +247,7 @@ http {
         {% endif %}
 
         {% if enable_barbican | bool %}# Region: {{ openstack_region_name }}, Service: barbican
-        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/barbican {
+        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/barbican/ {
             proxy_pass {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ barbican_api_port }}/;
             proxy_redirect {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ barbican_api_port }}/ {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/barbican/;
             proxy_buffering off;
@@ -259,7 +259,7 @@ http {
         {% endif %}
 
         {% if enable_designate | bool %}# Region: {{ openstack_region_name }}, Service: designate
-        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/designate {
+        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/designate/ {
             proxy_pass {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ designate_api_port }}/;
             proxy_redirect {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ designate_api_port }}/ {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/designate/;
             proxy_buffering off;
@@ -271,7 +271,7 @@ http {
         {% endif %}
 
         {% if enable_masakari | bool %}# Region: {{ openstack_region_name }}, Service: masakari
-        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/masakari {
+        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/masakari/ {
             proxy_pass {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ masakari_api_port }}/;
             proxy_redirect {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ masakari_api_port }}/ {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/masakari/;
             proxy_buffering off;
@@ -283,7 +283,7 @@ http {
         {% endif %}
 
         {% if enable_ceph_rgw | bool %}# Region: {{ openstack_region_name }}, Service: ceph_rgw
-        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/swift {
+        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/swift/ {
             proxy_pass {{ internal_protocol }}://{{ ceph_rgw_internal_fqdn }}:{{ ceph_rgw_port }}/{{ 'swift' if not ceph_rgw_swift_compatibility | bool }};
             proxy_redirect {{ internal_protocol }}://{{ ceph_rgw_internal_fqdn }}:{{ ceph_rgw_port }}/{{ 'swift' if not ceph_rgw_swift_compatibility | bool }} {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/swift/;
             proxy_buffering off;
@@ -293,7 +293,7 @@ http {
             proxy_set_header Host $http_host;
         }
         {% elif skyline_external_swift | bool %}# Region: {{ openstack_region_name }}, Service: external swift
-        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/swift {
+        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/swift/ {
             proxy_pass {{ skyline_external_swift_url }};
             proxy_redirect {{ skyline_external_swift_url }} {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/swift/;
             proxy_buffering off;