From 4f65e0153c22886b118bdb92402b91d9b209632c Mon Sep 17 00:00:00 2001
From: Chris Behrens <cbehrens@codestud.com>
Date: Tue, 30 Aug 2011 13:53:01 -0700
Subject: [PATCH] restore old way FLAGS.rpc_backend worked..  no short name
 support for consistency

---
 nova/rpc/__init__.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/nova/rpc/__init__.py b/nova/rpc/__init__.py
index fe50fb47670a..4f57a345d088 100644
--- a/nova/rpc/__init__.py
+++ b/nova/rpc/__init__.py
@@ -23,18 +23,10 @@ from nova import flags
 
 FLAGS = flags.FLAGS
 flags.DEFINE_string('rpc_backend',
-                    'kombu',
+                    'nova.rpc.impl_kombu',
                     "The messaging module to use, defaults to kombu.")
 
-impl_table = {'kombu': 'nova.rpc.impl_kombu',
-                'amqp': 'nova.rpc.impl_kombu',
-                'carrot': 'nova.rpc.impl_carrot'}
-
-
-# rpc_backend can be a short name like 'kombu', or it can be the full
-# module name
-RPCIMPL = import_object(impl_table.get(FLAGS.rpc_backend,
-        FLAGS.rpc_backend))
+RPCIMPL = import_object(FLAGS.rpc_backend)
 
 
 def create_connection(new=True):