diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index ffee1229da..94b3ed208a 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -471,6 +471,7 @@ enable_tacker: "no"
 enable_telegraf: "no"
 enable_tempest: "no"
 enable_trove: "no"
+enable_trove_singletenant: "no"
 enable_vitrage: "no"
 enable_vmtp: "no"
 enable_watcher: "no"
diff --git a/ansible/roles/trove/templates/trove-taskmanager.conf.j2 b/ansible/roles/trove/templates/trove-taskmanager.conf.j2
index 799d3a2bd2..ff964e448b 100644
--- a/ansible/roles/trove/templates/trove-taskmanager.conf.j2
+++ b/ansible/roles/trove/templates/trove-taskmanager.conf.j2
@@ -3,9 +3,14 @@ debug = {{ trove_logging_debug }}
 
 log_dir = /var/log/kolla/trove
 
+{% if enable_trove_singletenant | bool %}
 nova_proxy_admin_pass = {{ trove_keystone_password }}
 nova_proxy_admin_tenant_name = services
 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
+{% endif %}
 taskmanager_manager = trove.taskmanager.manager.Manager
 
 transport_url = {{ rpc_transport_url }}
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 1b57792752..96519c1572 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -231,6 +231,7 @@ kolla_internal_vip_address: "10.10.10.254"
 #enable_tacker: "no"
 #enable_tempest: "no"
 #enable_trove: "no"
+#enable_trove_singletenant: "no"
 #enable_vitrage: "no"
 #enable_vmtp: "no"
 #enable_watcher: "no"
diff --git a/releasenotes/notes/add-trove-singletenant-dd02a7b7cc1a4f99.yaml b/releasenotes/notes/add-trove-singletenant-dd02a7b7cc1a4f99.yaml
new file mode 100644
index 0000000000..8615136879
--- /dev/null
+++ b/releasenotes/notes/add-trove-singletenant-dd02a7b7cc1a4f99.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Add "enable_trove_singletenant" option to enable the Trove single
+    tenant functionnality. This feature will allow Trove to create
+    Nova instances in a different tenant than the user tenant.