openstack/kolla-ansible
Code Issues Proposed changes

Merge "OpenStack Services Should Use keystone_internal_url for auth"

Browse Source
This commit is contained in:
Jenkins 2016-10-16 14:30:52 +00:00 committed by Gerrit Code Review
commit d3ed3be3b7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/horizon/templates/local_settings.j2
View File

@ -192,7 +192,7 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
OPENSTACK_HOST = "{% if orchestration_engine == 'KUBERNETES' %}{{ api_interface_address }}{% else %}{{ kolla_internal_fqdn }}{% endif %}"
OPENSTACK_KEYSTONE_URL = "{{ keystone_public_url }}"
OPENSTACK_KEYSTONE_URL = "{{ keystone_internal_url }}"
OPENSTACK_KEYSTONE_DEFAULT_ROLE = "{{ horizon_openstack_keystone_default_role }}"
# Enables keystone web single-sign-on if set to True.

2
ansible/roles/neutron/templates/neutron.conf.j2
View File

@ -72,7 +72,7 @@ connection = mysql+pymysql://{{ neutron_database_user }}:{{ neutron_database_pas
max_retries = -1
[keystone_authtoken]
auth_uri = {{ keystone_public_url }}
auth_uri = {{ keystone_internal_url }}
auth_url = {{ keystone_admin_url }}
auth_type = password
project_domain_id = default