diff --git a/ansible/roles/magnum/defaults/main.yml b/ansible/roles/magnum/defaults/main.yml
index 98fa73ae39140dc924d658294190a3de72bab03e..9e7c2ac6129e932325554b34961206f8b4cec45b 100644
--- a/ansible/roles/magnum/defaults/main.yml
+++ b/ansible/roles/magnum/defaults/main.yml
@@ -31,6 +31,12 @@ magnum_database_user: "magnum"
 magnum_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
 
 
+####################
+# Magnum
+####################
+enable_cluster_user_trust: False
+
+
 ####################
 # Docker
 ####################
diff --git a/ansible/roles/magnum/templates/magnum.conf.j2 b/ansible/roles/magnum/templates/magnum.conf.j2
index 8443511cb76e5c1ddd583b0048e746abddef18d0..aeec3ac564f4966913d1d2ec0f4dddac36d68c4b 100644
--- a/ansible/roles/magnum/templates/magnum.conf.j2
+++ b/ansible/roles/magnum/templates/magnum.conf.j2
@@ -72,6 +72,7 @@ memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansi
 trustee_domain_admin_password = {{ magnum_keystone_password }}
 trustee_domain_admin_name = {{ magnum_trustee_domain_admin }}
 trustee_domain_name = {{ magnum_trustee_domain }}
+cluster_user_trust = {{ enable_cluster_user_trust }}
 
 [oslo_concurrency]
 lock_path = /var/lib/magnum/tmp