From bc9f3f19317c8d440436e89d5b3a5a3ca1fdfe1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Kr=C4=8Dek?= <roman.krcek@tietoevry.com>
Date: Mon, 11 Mar 2024 11:26:13 +0100
Subject: [PATCH] Fix trove module imports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Path to the modules needed by trove-api changed in source trove
package so the configuration was updated.

Closes-bug: #1937120
Signed-of-by: Roman KrĨek <roman.krcek@tietoevry.com>
Change-Id: I5df02af004fabb9bb1d6ca7c3fd83954cbf63a51
---
 ansible/roles/trove/templates/trove.conf.j2          | 6 +++---
 releasenotes/notes/bug-1937120-cd1ad24a9a4be739.yaml | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/bug-1937120-cd1ad24a9a4be739.yaml

diff --git a/ansible/roles/trove/templates/trove.conf.j2 b/ansible/roles/trove/templates/trove.conf.j2
index 22d559ca28..238575dcdb 100644
--- a/ansible/roles/trove/templates/trove.conf.j2
+++ b/ansible/roles/trove/templates/trove.conf.j2
@@ -19,9 +19,9 @@ transport_url = {{ rpc_transport_url }}
 nova_proxy_admin_pass = {{ trove_keystone_password }}
 nova_proxy_admin_tenant_name = service
 nova_proxy_admin_user = trove
-remote_nova_client = trove.common.single_tenant_remote.nova_client_trove_admin
-remote_cinder_client = trove.common.single_tenant_remote.cinder_client_trove_admin
-remote_neutron_client = trove.common.single_tenant_remote.neutron_client_trove_admin
+remote_nova_client = trove.common.clients_admin.nova_client_trove_admin
+remote_cinder_client = trove.common.clients_admin.cinder_client_trove_admin
+remote_neutron_client = trove.common.clients_admin.neutron_client_trove_admin
 {% endif %}
 
 nova_compute_endpoint_type = internalURL
diff --git a/releasenotes/notes/bug-1937120-cd1ad24a9a4be739.yaml b/releasenotes/notes/bug-1937120-cd1ad24a9a4be739.yaml
new file mode 100644
index 0000000000..2eb07029bb
--- /dev/null
+++ b/releasenotes/notes/bug-1937120-cd1ad24a9a4be739.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixes trove module imports.
+    Path to the modules needed by trove-api changed in source trove
+    package so the configuration was updated.
+    `LP#1937120 <https://launchpad.net/bugs/1937120>`__