From 008e2b15ec9c31bfb516839106c1e00f87fca34c Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Mon, 4 Mar 2019 14:10:01 +0800 Subject: [PATCH] Deploy Sahara with unversioned endpoints Sahara supports unversioned endpoint also for the current API v1.1, and deploying with unversioned endpoints is a better setting if people want to use both API v1.1 and the (soon-stable) API v2 at the same time. See https://review.openstack.org/#/c/582285/ for more details. Change-Id: I0f3ed4674f9629963e0a10118ad5d9b194fd4661 Closes-Bug: #1782147 --- ansible/roles/sahara/defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/roles/sahara/defaults/main.yml b/ansible/roles/sahara/defaults/main.yml index 75fa50d5d1..89edd7a580 100644 --- a/ansible/roles/sahara/defaults/main.yml +++ b/ansible/roles/sahara/defaults/main.yml @@ -69,9 +69,9 @@ sahara_engine_dimensions: "{{ default_container_dimensions }}" #################### # OpenStack #################### -sahara_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ sahara_api_port }}/v1.1/%(tenant_id)s" -sahara_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ sahara_api_port }}/v1.1/%(tenant_id)s" -sahara_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ sahara_api_port }}/v1.1/%(tenant_id)s" +sahara_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ sahara_api_port }}" +sahara_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ sahara_api_port }}" +sahara_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ sahara_api_port }}" sahara_logging_debug: "{{ openstack_logging_debug }}"