diff --git a/manifests/controller.pp b/manifests/controller.pp
index 3e82160..6dd482b 100644
--- a/manifests/controller.pp
+++ b/manifests/controller.pp
@@ -403,6 +403,7 @@ class openstack::controller (
       bind_host          => $cinder_bind_address,
       keystone_auth_host => $keystone_host,
       keystone_password  => $cinder_user_password,
+      rabbit_userid      => $rabbit_user,
       rabbit_password    => $rabbit_password,
       rabbit_host        => $rabbit_host,
       db_password        => $cinder_db_password,
diff --git a/spec/classes/openstack_controller_spec.rb b/spec/classes/openstack_controller_spec.rb
index e1a4917..af69d41 100644
--- a/spec/classes/openstack_controller_spec.rb
+++ b/spec/classes/openstack_controller_spec.rb
@@ -455,6 +455,7 @@ describe 'openstack::controller' do
       let :params do
         default_params.merge(
           :verbose              => 'True',
+          :rabbit_user          => 'rabbituser',
           :rabbit_password      => 'rabbit_pw2',
           :cinder_user_password => 'foo',
           :cinder_db_password   => 'bar',
@@ -467,7 +468,8 @@ describe 'openstack::controller' do
         should contain_class('cinder').with(
           :verbose         => 'True',
           :sql_connection  => 'mysql://baz:bar@127.0.0.2/blah?charset=utf8',
-          :rabbit_password => 'rabbit_pw2'
+          :rabbit_password => 'rabbit_pw2',
+          :rabbit_userid   => 'rabbituser'
         )
         should contain_class('cinder::api').with_keystone_password('foo')
         should contain_class('cinder::scheduler')