diff --git a/nova/config.py b/nova/config.py
index f4118466f2..9ce068e585 100644
--- a/nova/config.py
+++ b/nova/config.py
@@ -276,6 +276,9 @@ global_opts = [
     cfg.StrOpt('auth_strategy',
                default='noauth',
                help='The strategy to use for auth: noauth or keystone.'),
+    cfg.StrOpt('control_exchange',
+               default='nova',
+               help='AMQP exchange to connect to if using RabbitMQ or Qpid'),
 ]
 
 cfg.CONF.register_opts(global_opts)