openstack/openstack-ansible-os_trove
Code Issues Proposed changes

Fix Trove URIs

Browse Source 
The openstack service uris protocol variables were not being used
to set the Trove specific uris. This resulted in 'http' always being
used for the public, admin, and internal uris even when 'https' was
intended.

Change-Id: I8a1fd0a851b932f8ee853866155e968824ed5fb8
This commit is contained in:
Kyle L. Henderson 2017-03-30 09:13:37 -05:00
parent 6bb0c94acc
commit 277c454e80
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
defaults/main.yml
View File

@ -46,11 +46,12 @@ trove_service_admin_role_names:
trove_service_region: RegionOne
trove_service_host: "0.0.0.0"
trove_service_port: 8779
trove_service_publicuri_proto: http
trove_service_proto: http
trove_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(trove_service_proto) }}"
trove_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(trove_service_proto) }}"
trove_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(trove_service_proto) }}"
trove_service_publicurl: "{{ trove_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ trove_service_port }}/v1.0/%(tenant_id)s"
trove_service_internaluri_proto: http
trove_service_internalurl: "{{ trove_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ trove_service_port }}/v1.0/%(tenant_id)s"
trove_service_adminuri_proto: http
trove_service_adminurl: "{{ trove_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ trove_service_port }}/v1.0/%(tenant_id)s"
trove_auth_url: "{{ keystone_service_internalurl }}"
trove_nova_compute_url: "{{ trove_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ nova_service_port }}/v2.1"

5
releasenotes/notes/public-uri-proto-a1f05edd1a594f7f.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- The openstack service uri protocol variables were not being used to
set the Trove specific uris. This resulted in 'http' always being used
for the public, admin and internal uris even when 'https' was intended.