Merge "ensure OPENSTACK_KEYSTONE_URL is always configured"

This commit is contained in:
Jenkins 2017-02-24 16:37:57 +00:00 committed by Gerrit Code Review
commit e097fb9890

View File

@ -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 }}"