openstack
/
kayobe
Code Issues Proposed changes

Remove explicit setting of versionless keystone endpoints in k-a 

These are now the defaults used by kolla-ansible.
This commit is contained in:
Mark Goddard 2017-10-12 11:20:15 +01:00
parent ce60327b60
commit be589e42c9
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/kolla-ansible/templates/globals.yml.j2
View File

@ -177,12 +177,6 @@ enable_{{ feature_flag }}: {{ hostvars[inventory_hostname]['kolla_enable_' ~ fea
# 28800(8 hour), 43200(12 hour), 86400(1 day), 604800(1 week).
#fernet_token_expiry: 86400
# Use versionless endpoints for Keystone to avoid hitting an issue similar to
# TripleO issue https://bugs.launchpad.net/tripleo/+bug/1667679.
keystone_admin_url: "{% raw %}{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}{% endraw %}"
keystone_internal_url: "{% raw %}{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}{% endraw %}"
keystone_public_url: "{% raw %}{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ keystone_public_port }}{% endraw %}"
#######################
# Glance options