openstack/openstack-ansible
Code Issues Proposed changes

Correct local_settings when AVAILABLE_REGIONS is set

Browse Source 
As per the discussion in https://review.openstack.org/190302:

When AVAILABLE_REGIONS is set, OPENSTACK_HOST and
OPENSTACK_KEYSTONE_URL are no longer required in local_settings
as per Horizon developer documentation.

This patch implements this either/or configuration.

Change-Id: Iee9b41c34f770f2e8d76ef0e1e1a974f286ca6a9
Closes-Bug: #1463772
This commit is contained in:
Jesse Pretorius 2015-06-12 11:29:18 +01:00
parent e1862a190b
commit dff9e1e88a
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
playbooks/roles/os_horizon/templates/horizon_local_settings.py.j2
View File

@ -162,16 +162,22 @@ AVAILABLE_REGIONS = [
('{{ item.url }}', '{{ item.name }}'),
{% endfor %}
]
# This is not used because AVAILABLE_REGIONS is defined
#OPENSTACK_HOST = "{{ internal_lb_vip_address }}"
#OPENSTACK_KEYSTONE_URL = "{{ keystone_service_internalurl }}"
{% else %}
# For multiple regions uncomment this configuration, and add (endpoint, title).
# AVAILABLE_REGIONS = [
# ('http://cluster1.example.com:5000/v2.0', 'cluster1'),
# ('http://cluster2.example.com:5000/v2.0', 'cluster2'),
# ]
{% endif %}
# This is only used if AVAILABLE_REGIONS is not defined
OPENSTACK_HOST = "{{ internal_lb_vip_address }}"
OPENSTACK_KEYSTONE_URL = "{{ keystone_service_internalurl }}"
{% endif %}
OPENSTACK_KEYSTONE_DEFAULT_ROLE = "_member_"
# Enables keystone web single-sign-on if set to True.