openstack
/
openstack-ansible
Code Issues Proposed changes

Only use public_endpoint when specified 

Default public_endpoint in keystone.conf to not be set, unless
specified. By default public_endpoint isn't required.

Change-Id: I5f5c213ef639f548b80080c5c5338db610b0b7f8
Closes-Bug: #1421048
This commit is contained in:
Andy McCrae 2015-02-25 15:19:31 +00:00
parent 2758e1a4ad
commit b760326840
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
playbooks/roles/os_keystone/defaults/main.yml
View File

@ -80,6 +80,9 @@ keystone_service_internalurl_v3: "{{ keystone_service_internaluri_v3 }}/v3"
keystone_service_adminuri_v3: "{{ keystone_service_proto }}://{{ internal_lb_vip_address }}:{{ keystone_admin_port }}"
keystone_service_adminurl_v3: "{{ keystone_service_adminuri_v3 }}/v3"
## Set this value to override the "public_endpoint" keystone.conf variable
#keystone_public_endpoint:
## Apache setup
keystone_apache_log_level: info

4
playbooks/roles/os_keystone/templates/keystone.conf.j2
View File

@ -6,7 +6,9 @@ debug = {{ debug }}
admin_token = {{ keystone_auth_admin_token }}
bind_host = {{ keystone_bind_address }}
public_port = {{ keystone_service_port }}
public_endpoint = {{ keystone_service_publicuri }}
{% if keystone_public_endpoint is defined %}
public_endpoint = {{ keystone_public_endpoint }}
{% endif %}
admin_port = {{ keystone_admin_port }}
admin_endpoint = {{ keystone_service_adminuri }}