From 7370e01b4a9c9a97b84dbdad61528f663534db7a Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez <dabarren@gmail.com>
Date: Mon, 3 Oct 2016 17:23:52 +0200
Subject: [PATCH] Fix sahara endpoint url

Sahara endpoint need api version and tenant_id
in the URL, otherwise will fail with an incorrect
path/resource could not be found.

Change-Id: I348919b8ff1d00a1f6ce782f07ce2354201bac8b
Closes-Bug: #1629895
---
 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 ef08ec8f03..d545f68346 100644
--- a/ansible/roles/sahara/defaults/main.yml
+++ b/ansible/roles/sahara/defaults/main.yml
@@ -25,9 +25,9 @@ sahara_api_image_full: "{{ sahara_api_image }}:{{ sahara_api_tag }}"
 ####################
 # OpenStack
 ####################
-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_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_logging_debug: "{{ openstack_logging_debug }}"