diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-16 14:30:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-16 14:30:52 +0000 |
| commit | d3ed3be3b799e576a90190ba1e9a001cd49fea55 (patch) | |
| tree | 316c29a93970954c75fa64d7a3f1a5b801322494 | |
| parent | 77e2dfbd73bb7f0de1ea191d6df4a97d2f3152fd (diff) | |
| parent | cc2dde0854e72ed3361f8a7b54cde091a04e17cc (diff) | |
| download | kolla-d3ed3be3b799e576a90190ba1e9a001cd49fea55.tar.gz kolla-d3ed3be3b799e576a90190ba1e9a001cd49fea55.zip | |
Merge "OpenStack Services Should Use keystone_internal_url for auth"
| -rw-r--r-- | ansible/roles/horizon/templates/local_settings.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/neutron/templates/neutron.conf.j2 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ansible/roles/horizon/templates/local_settings.j2 b/ansible/roles/horizon/templates/local_settings.j2 index c5abb28d3..891b19441 100644 --- a/ansible/roles/horizon/templates/local_settings.j2 +++ b/ansible/roles/horizon/templates/local_settings.j2 @@ -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. diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2 index 6b899ed0c..d9f625622 100644 --- a/ansible/roles/neutron/templates/neutron.conf.j2 +++ b/ansible/roles/neutron/templates/neutron.conf.j2 @@ -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 |