From e1eeaaed2aef03dd7367070fb009db93353cb687 Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Thu, 11 Jun 2015 18:42:51 +0100 Subject: [PATCH] Allow protocol to be set per endpoint-type If services are running behind an SSL terminating LB you will want to differentiate between protocol on internalURL and publicURL endpoints. This patch allows you to set the values of protocol per endpoint type, but doesn't change the default behaviour which is to have it set in one var. Change-Id: I7a74c85a8841499623746586ae27103a71c6fec0 Partial-Bug: #1399383 --- defaults/main.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 00ff1bc8..209b9589 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -46,12 +46,15 @@ swift_service_user_domain_id: "default" swift_service_role_name: "admin" swift_service_type: object-store swift_service_proto: http +swift_service_publicuri_proto: "{{ swift_service_proto }}" +swift_service_adminuri_proto: "{{ swift_service_proto }}" +swift_service_internaluri_proto: "{{ swift_service_proto }}" swift_service_description: "Object Storage Service" -swift_service_publicuri: "{{ swift_service_proto }}://{{ external_lb_vip_address }}:{{ swift_proxy_port }}" +swift_service_publicuri: "{{ swift_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ swift_proxy_port }}" swift_service_publicurl: "{{ swift_service_publicuri }}/v1/AUTH_%(tenant_id)s" -swift_service_adminuri: "{{ swift_service_proto }}://{{ internal_lb_vip_address }}:{{ swift_proxy_port }}" +swift_service_adminuri: "{{ swift_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ swift_proxy_port }}" swift_service_adminurl: "{{ swift_service_adminuri }}/v1/AUTH_%(tenant_id)s" -swift_service_internaluri: "{{ swift_service_proto }}://{{ internal_lb_vip_address }}:{{ swift_proxy_port }}" +swift_service_internaluri: "{{ swift_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ swift_proxy_port }}" swift_service_internalurl: "{{ swift_service_internaluri }}/v1/AUTH_%(tenant_id)s" swift_service_region: RegionOne