From b6ab5bf7e91b7b762e647745d99c19fdafc8d021 Mon Sep 17 00:00:00 2001
From: Bertrand Lallau <bertrand.lallau@gmail.com>
Date: Wed, 29 Mar 2017 21:22:07 +0200
Subject: [PATCH] Trove fix backup restore with Swift

'v1' is missing in DEFAULT/swift_url property for trove.conf and
trove-taskmanager.conf file.

Closes-Bug: #1677362
Change-Id: I7f625b1ac665a26c4207c3cbb9b0238da82993d8
---
 ansible/roles/trove/templates/trove-taskmanager.conf.j2 | 2 +-
 ansible/roles/trove/templates/trove.conf.j2             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/trove/templates/trove-taskmanager.conf.j2 b/ansible/roles/trove/templates/trove-taskmanager.conf.j2
index 1f6fff2d95..568e46148b 100644
--- a/ansible/roles/trove/templates/trove-taskmanager.conf.j2
+++ b/ansible/roles/trove/templates/trove-taskmanager.conf.j2
@@ -18,7 +18,7 @@ nova_compute_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ nova_a
 cinder_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ cinder_api_port }}/v1
 {% endif %}
 {% if enable_swift | bool %}
-swift_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ swift_api_port }}/AUTH_
+swift_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ swift_api_port }}/v1/AUTH_
 {% endif %}
 
 [database]
diff --git a/ansible/roles/trove/templates/trove.conf.j2 b/ansible/roles/trove/templates/trove.conf.j2
index 6c97b89ae6..378000dcce 100644
--- a/ansible/roles/trove/templates/trove.conf.j2
+++ b/ansible/roles/trove/templates/trove.conf.j2
@@ -20,7 +20,7 @@ nova_compute_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ nova_a
 cinder_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ cinder_api_port }}/v1
 {% endif %}
 {% if enable_swift | bool %}
-swift_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ swift_api_port }}/AUTH_
+swift_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ swift_api_port }}/v1/AUTH_
 {% endif %}
 
 [database]