From 394c7960bfa78253a4b91a712876cd22c1b0d13e Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Fri, 19 Jun 2015 15:29:30 +0100 Subject: [PATCH] Add global endpoint_type_proto options This allows you to set the endpoint-type protocol globally for all services, e.g. internaluri can be http, and publicuri can be https. You will no longer have to specify it per service, although those settings already exist and have not changed. This patch changes no functionality for existing installs or deployments and the values are defaulted to be the same as before, but allows these values to be adjusted on a per-endpoint type basis. Change-Id: I4854216726491f6ea4e265694e702f980fddc5a6 Closes-Bug: #1399383 --- defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index acd6a597..7e05ff09 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -85,9 +85,9 @@ keystone_service_region: RegionOne keystone_service_name: keystone keystone_service_port: 5000 keystone_service_proto: http -keystone_service_publicuri_proto: "{{ keystone_service_proto }}" -keystone_service_adminuri_proto: "{{ keystone_service_proto }}" -keystone_service_internaluri_proto: "{{ keystone_service_proto }}" +keystone_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(keystone_service_proto) }}" +keystone_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(keystone_service_proto) }}" +keystone_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(keystone_service_proto) }}" keystone_service_type: identity keystone_service_description: "Keystone Identity Service" keystone_service_user_name: keystone