From 277c454e80bfc21834356969a2d3d48b5ca969f5 Mon Sep 17 00:00:00 2001 From: "Kyle L. Henderson" Date: Thu, 30 Mar 2017 09:13:37 -0500 Subject: [PATCH] Fix Trove URIs 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 --- defaults/main.yml | 7 ++++--- releasenotes/notes/public-uri-proto-a1f05edd1a594f7f.yaml | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/public-uri-proto-a1f05edd1a594f7f.yaml diff --git a/defaults/main.yml b/defaults/main.yml index 8b13e0e..fcc2a9e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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" diff --git a/releasenotes/notes/public-uri-proto-a1f05edd1a594f7f.yaml b/releasenotes/notes/public-uri-proto-a1f05edd1a594f7f.yaml new file mode 100644 index 0000000..314697c --- /dev/null +++ b/releasenotes/notes/public-uri-proto-a1f05edd1a594f7f.yaml @@ -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.