diff --git a/manifests/init.pp b/manifests/init.pp
index ad517117..5132e2d1 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -17,6 +17,7 @@ class cinder (
   $sql_connection,
   $sql_idle_timeout            = '3600',
   $rpc_backend                 = 'cinder.openstack.common.rpc.impl_kombu',
+  $control_exchange            = 'openstack',
   $rabbit_host                 = '127.0.0.1',
   $rabbit_port                 = 5672,
   $rabbit_hosts                = false,
@@ -85,6 +86,7 @@ class cinder (
       'DEFAULT/rabbit_password':     value => $rabbit_password, secret => true;
       'DEFAULT/rabbit_userid':       value => $rabbit_userid;
       'DEFAULT/rabbit_virtual_host': value => $rabbit_virtual_host;
+      'DEFAULT/control_exchange':    value => $control_exchange;
     }
 
     if $rabbit_hosts {
diff --git a/spec/classes/cinder_spec.rb b/spec/classes/cinder_spec.rb
index cd8e712b..0b661fb2 100644
--- a/spec/classes/cinder_spec.rb
+++ b/spec/classes/cinder_spec.rb
@@ -19,6 +19,9 @@ describe 'cinder' do
       should contain_cinder_config('DEFAULT/rpc_backend').with(
         :value => 'cinder.openstack.common.rpc.impl_kombu'
       )
+      should contain_cinder_config('DEFAULT/control_exchange').with(
+        :value => 'openstack'
+      )
       should contain_cinder_config('DEFAULT/rabbit_password').with(
         :value => 'guest',
         :secret => true