Merge "[Horizon] Allow configuration of Keystone's URL"

ansible/roles/horizon/defaults/main.yml

@@ -60,6 +60,7 @@ horizon_image_full: "{{ horizon_image }}:{{ horizon_tag }}"
 # OpenStack
 ####################
 horizon_logging_debug: "{{ openstack_logging_debug }}"
+horizon_keystone_url: "{{ keystone_internal_url }}"
 
 
 ####################

ansible/roles/horizon/templates/local_settings.j2

@@ -206,7 +206,7 @@ AVAILABLE_REGIONS = [
 
 OPENSTACK_HOST = "{{ kolla_internal_fqdn }}"
 
-OPENSTACK_KEYSTONE_URL = "{{ keystone_internal_url }}"
+OPENSTACK_KEYSTONE_URL = "{{ horizon_keystone_url }}"
 OPENSTACK_KEYSTONE_DEFAULT_ROLE = "{{ keystone_default_user_role }}"
 
 # Enables keystone web single-sign-on if set to True.

releasenotes/notes/horizon-keystone-url-97dcc26389f6d025.yaml

+---
+features:
+  - |
+    Introduces a new variable, horizon_keystone_url, which facilitates
+    overriding the URL used by Horizon to talk to the identity service
+    (Keystone).  Defaults to the identity service's internal URL.