diff --git a/packstack/puppet/modules/packstack/manifests/heat/rabbitmq.pp b/packstack/puppet/modules/packstack/manifests/heat/rabbitmq.pp
index d7cbe25c1..4645fd4b8 100644
--- a/packstack/puppet/modules/packstack/manifests/heat/rabbitmq.pp
+++ b/packstack/puppet/modules/packstack/manifests/heat/rabbitmq.pp
@@ -29,6 +29,10 @@ class packstack::heat::rabbitmq ()
       $heat_notification_driver = $::os_service_default
     }
 
+    class { 'heat::trustee':
+      password => lookup('CONFIG_HEAT_KS_PW'),
+      auth_url => lookup('CONFIG_KEYSTONE_ADMIN_URL'),
+    }
     class { 'heat::keystone::authtoken':
       password             => lookup('CONFIG_HEAT_KS_PW'),
       www_authenticate_uri => lookup('CONFIG_KEYSTONE_PUBLIC_URL'),