openstack/openstack-ansible-os_horizon
Code Issues Proposed changes

Merge "Correct local_settings when AVAILABLE_REGIONS is set"

Browse Source
This commit is contained in:
Jenkins 2015-06-22 15:02:14 +00:00 committed by Gerrit Code Review
commit 3a710c2009
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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.