Skip to content

Commit

Permalink
Fix brick remotefs dependency on cinder
Browse files Browse the repository at this point in the history
This patch moves an exception from cinder.exception
into brick.exception to fix an import in remotefs.

Fixes Bug #1221309

Change-Id: I9b060c1e1129b3fe30145227712d0234e0f42504
  • Loading branch information
hemna committed Sep 5, 2013
1 parent 65f4f22 commit 12f3d78
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 4 additions & 0 deletions cinder/brick/exception.py
Expand Up @@ -126,3 +126,7 @@ class ISCSITargetRemoveFailed(BrickException):

class ISCSITargetAttachFailed(BrickException):
message = _("Failed to attach iSCSI target for volume %(volume_id)s.")


class ProtocolNotSupported(BrickException):
message = _("Connect to volume via protocol %(protocol)s not supported.")
2 changes: 1 addition & 1 deletion cinder/brick/remotefs/remotefs.py
Expand Up @@ -22,7 +22,7 @@

from oslo.config import cfg

from cinder import exception
from cinder.brick import exception
from cinder.openstack.common.gettextutils import _
from cinder.openstack.common import log as logging
from cinder.openstack.common import processutils as putils
Expand Down
4 changes: 0 additions & 4 deletions cinder/exception.py
Expand Up @@ -609,10 +609,6 @@ class VolumeMigrationFailed(CinderException):
message = _("Volume migration failed") + ": %(reason)s"


class ProtocolNotSupported(CinderException):
message = _("Connect to volume via protocol %(protocol)s not supported.")


class SSHInjectionThreat(CinderException):
message = _("SSH command injection detected") + ": %(command)s"

Expand Down

0 comments on commit 12f3d78

Please sign in to comment.