From bc2d20d3bb4d9fb01b3be84c1e76816dc98a502a Mon Sep 17 00:00:00 2001 From: vponomaryov Date: Mon, 3 Mar 2014 16:26:04 +0200 Subject: [PATCH] Removed swiftclient from dependencies Swiftclient was in dependencies as artifact after port from cinder. Removed as unnecessary requirement itself and related stuff. Change-Id: I92fa249031e98a38aba721c0f3d1d7489abd562a --- doc/source/conf.py | 3 +-- doc/source/man/manila-manage.rst | 1 - manila/exception.py | 4 ---- requirements.txt | 1 - 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 4d702c7faf..b56addcc57 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -240,5 +240,4 @@ latex_documents = [ # Example configuration for intersphinx: refer to the Python standard library. -intersphinx_mapping = {'python': ('http://docs.python.org/', None), - 'swift': ('http://swift.openstack.org', None)} +intersphinx_mapping = {'python': ('http://docs.python.org/', None), } diff --git a/doc/source/man/manila-manage.rst b/doc/source/man/manila-manage.rst index e205a02029..cea722aa93 100644 --- a/doc/source/man/manila-manage.rst +++ b/doc/source/man/manila-manage.rst @@ -270,7 +270,6 @@ SEE ALSO ======== * `OpenStack Manila `__ -* `OpenStack Swift `__ BUGS ==== diff --git a/manila/exception.py b/manila/exception.py index 355c6d22cb..64e05dcccf 100644 --- a/manila/exception.py +++ b/manila/exception.py @@ -489,10 +489,6 @@ class InvalidShareSnapshot(ManilaException): message = _("Invalid share snapshot: %(reason)s") -class SwiftConnectionFailed(ManilaException): - message = _("Connection to swift failed") + ": %(reason)s" - - class ShareMetadataNotFound(NotFound): message = _("Metadata item is not found") diff --git a/requirements.txt b/requirements.txt index 989cf8fcf2..f7cfdf4b76 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,7 +16,6 @@ PasteDeploy>=1.5.0 python-neutronclient>=2.3.0,<3 python-glanceclient>=0.9.0 python-keystoneclient>=0.3.2 -python-swiftclient>=1.5 Routes>=1.12.3 SQLAlchemy>=0.7.8,<=0.7.99 sqlalchemy-migrate>=0.7.2