From 474b15dc5bc5c58c49131e7f92e69776acade831 Mon Sep 17 00:00:00 2001
From: goldyfruit <gaetan.trellu@incloudus.com>
Date: Mon, 15 Jan 2018 10:33:49 -0500
Subject: [PATCH] Add os_region_name to Trove configuration files
By default Trove is looking for "RegionOne", if the region is
different the os_region_name parameter needs to be defined withing
the Trove configuration files.
To solve this issue, we need to set "os_region_name" option in
trove-api, trove-taskmanager and trove-conductor configuration.
os_region_name = {{ openstack_region_name }}
Change-Id: I1397046d2c88ba50d01a65c48e021d3535fe39d2
Closes-bug: #1743402
---
ansible/roles/trove/templates/trove-conductor.conf.j2 | 2 ++
ansible/roles/trove/templates/trove-taskmanager.conf.j2 | 2 ++
ansible/roles/trove/templates/trove.conf.j2 | 2 ++
3 files changed, 6 insertions(+)
diff --git a/ansible/roles/trove/templates/trove-conductor.conf.j2 b/ansible/roles/trove/templates/trove-conductor.conf.j2
index 76877962b..e9c4bc61c 100644
--- a/ansible/roles/trove/templates/trove-conductor.conf.j2
+++ b/ansible/roles/trove/templates/trove-conductor.conf.j2
@@ -8,6 +8,8 @@ control_exchange = trove
transport_url = {{ rpc_transport_url }}
+os_region_name = {{ openstack_region_name }}
+
[oslo_messaging_notifications]
transport_url = {{ notify_transport_url }}
diff --git a/ansible/roles/trove/templates/trove-taskmanager.conf.j2 b/ansible/roles/trove/templates/trove-taskmanager.conf.j2
index 3f35dc3e1..3fe27778b 100644
--- a/ansible/roles/trove/templates/trove-taskmanager.conf.j2
+++ b/ansible/roles/trove/templates/trove-taskmanager.conf.j2
@@ -12,6 +12,8 @@ transport_url = {{ rpc_transport_url }}
trove_auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3
+os_region_name = {{ openstack_region_name }}
+
nova_compute_endpoint_type = internalURL
neutron_endpoint_type = internalURL
swift_endpoint_type = internalURL
diff --git a/ansible/roles/trove/templates/trove.conf.j2 b/ansible/roles/trove/templates/trove.conf.j2
index 500c638ac..99121eac9 100644
--- a/ansible/roles/trove/templates/trove.conf.j2
+++ b/ansible/roles/trove/templates/trove.conf.j2
@@ -14,6 +14,8 @@ transport_url = {{ rpc_transport_url }}
trove_auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3
+os_region_name = {{ openstack_region_name }}
+
nova_compute_endpoint_type = internalURL
neutron_endpoint_type = internalURL
swift_endpoint_type = internalURL
--
GitLab