From fbd1492f1ff298565f823c1f8ea7ad71bdcb8e6c Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Fri, 3 Feb 2017 09:04:02 -0600 Subject: [PATCH] ensure OPENSTACK_KEYSTONE_URL is always configured This is being moved in the template file such that it will ensure the variable is always rendered. This change is needed for multi-region clouds. Change-Id: Ib3fa401e6ecf4053ef0a4a5bb9d18ae18ae7f07a Closes-Bug: #1660344 Signed-off-by: Kevin Carter --- templates/horizon_local_settings.py.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/horizon_local_settings.py.j2 b/templates/horizon_local_settings.py.j2 index 01ae53b0..41238d0a 100644 --- a/templates/horizon_local_settings.py.j2 +++ b/templates/horizon_local_settings.py.j2 @@ -164,9 +164,10 @@ AVAILABLE_REGIONS = [ {% else %} # Set Horizon to use a specific Keystone endpoint OPENSTACK_HOST = "{{ horizon_keystone_host }}" -OPENSTACK_KEYSTONE_URL = "{{ horizon_keystone_endpoint }}" {% endif %} +OPENSTACK_KEYSTONE_URL = "{{ horizon_keystone_endpoint }}" + # The default role assigned to users OPENSTACK_KEYSTONE_DEFAULT_ROLE = "{{ horizon_default_role_name }}"