From: KIYOHIRO ADACHI <adachi@mxs.nes.nec.co.jp>
Date: Wed, 2 Oct 2013 08:19:13 +0000 (+0900)
Subject: Remove incorrect class in cinder.conf.sample
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2a630f71af21334a1f3dd213205efcba1ef38ac4;p=openstack-build%2Fcinder-build.git

Remove incorrect class in cinder.conf.sample

cinder.openstack.common.exception has already been deleted.
It seems to be a leak in 'Change-Id:
I6f46f90bd74cc26fc01667e467e3dab38037eec3'.

Change-Id: Ic2000280f31e354da39a9bbb0d60142b431f58a6
Closes-Bug: #1234002
---

diff --git a/cinder/openstack/common/rpc/__init__.py b/cinder/openstack/common/rpc/__init__.py
index ff131c113..6c25e4cf9 100644
--- a/cinder/openstack/common/rpc/__init__.py
+++ b/cinder/openstack/common/rpc/__init__.py
@@ -56,8 +56,7 @@ rpc_opts = [
                help='Seconds to wait before a cast expires (TTL). '
                     'Only supported by impl_zmq.'),
     cfg.ListOpt('allowed_rpc_exception_modules',
-                default=['cinder.openstack.common.exception',
-                         'nova.exception',
+                default=['nova.exception',
                          'cinder.exception',
                          'exceptions',
                          ],
diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index a839c283f..0f0ce39e7 100644
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -786,7 +786,7 @@
 
 # Modules of exceptions that are permitted to be recreatedupon
 # receiving exception data from an rpc call. (list value)
-#allowed_rpc_exception_modules=cinder.openstack.common.exception,nova.exception,cinder.exception,exceptions
+#allowed_rpc_exception_modules=nova.exception,cinder.exception,exceptions
 
 # If passed, use a fake RabbitMQ provider (boolean value)
 #fake_rabbit=false