From 0fca39dd03791350f5059b25579c82b592e7102f Mon Sep 17 00:00:00 2001
From: jimmygc <guochao@winhong.com>
Date: Mon, 8 May 2017 15:12:28 +0800
Subject: [PATCH] Fix wrong variable used in trove role
There is no swift_api_port.
swift_proxy_server_port should be the correct one.
Closes-Bug: #1689260
Change-Id: I63e0edb76603374b479eabf0199c4024ad3e2dbd
---
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 0063299ff1..339cdfc32c 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 }}/v1/AUTH_
+swift_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ swift_proxy_server_port }}/v1/AUTH_
{% endif %}
[database]
diff --git a/ansible/roles/trove/templates/trove.conf.j2 b/ansible/roles/trove/templates/trove.conf.j2
index d5681d920c..6e46fc606e 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 }}/v1/AUTH_
+swift_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ swift_proxy_server_port }}/v1/AUTH_
{% endif %}
[database]