From 91fb275e5aff25084abc5678050b26f5da053e77 Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Wed, 18 Jul 2018 02:05:55 +0200 Subject: [PATCH] Deploy Sahara with unversioned endpoints Sahara supports unversioned endpoint also for the stable API v1.1, and this is a requirement in order to use the experimental API v2. See https://review.openstack.org/#/c/582285/ for more details. Following the pattern used for other services with unversioned endpoints, the sahara_service_*uri variables are directly and all sahara_service_*url can thus be removed. Closes-Bug: #1782147 Change-Id: I2d4477de6a3ad58fe58152b18e18a9a6dffdafd4 (cherry picked from commit 98c27423a9fdf22636eb7ec0e5a57a258e622dba) --- defaults/main.yml | 3 --- tasks/sahara_service_setup.yml | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index d4b887d..9d7acc0 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -114,11 +114,8 @@ sahara_service_user_domain_id: default sahara_service_project_domain_name: Default sahara_service_user_domain_name: Default sahara_service_publicuri: "{{ sahara_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ sahara_service_port }}" -sahara_service_publicurl: "{{ sahara_service_publicuri }}/v1.1/%(tenant_id)s" sahara_service_internaluri: "{{ sahara_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ sahara_service_port }}" -sahara_service_internalurl: "{{ sahara_service_internaluri }}/v1.1/%(tenant_id)s" sahara_service_adminuri: "{{ sahara_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ sahara_service_port }}" -sahara_service_adminurl: "{{ sahara_service_adminuri }}/v1.1/%(tenant_id)s" ## Keystone authentication middleware sahara_keystone_auth_plugin: password diff --git a/tasks/sahara_service_setup.yml b/tasks/sahara_service_setup.yml index 3f230d6..5b4ed5d 100644 --- a/tasks/sahara_service_setup.yml +++ b/tasks/sahara_service_setup.yml @@ -84,11 +84,11 @@ delay: 10 with_items: - interface: "public" - url: "{{ sahara_service_publicurl }}" + url: "{{ sahara_service_publicuri }}" - interface: "internal" - url: "{{ sahara_service_internalurl }}" + url: "{{ sahara_service_internaluri }}" - interface: "admin" - url: "{{ sahara_service_adminurl }}" + url: "{{ sahara_service_adminuri }}" - name: Add proxy domain os_keystone_domain: