clean up requirements

Backend store-specific requirements are not hard requirements, since
the choice of backend store is up to the operator. The
python-swiftclient and oslo.vmware modules are herein moved out of
requirements.txt and instead listed as optional requirements using
the extras functionality in setup.cfg.

Removed unnecessary import of swift backend in db migration, to allow
python-swiftclient to move out of hard requirements.

Cleaned up other requirements that are no longer used.

Change-Id: I9edbf8a614b5caaf38b4c59bd864b7baa55bf36b
Depends-On: I94d75e3d52c9e3e9f7a741a079d25b1bdff29b27
Closes-Bug: #1475737
This commit is contained in:
Matthew Edmonds 2015-07-17 16:54:28 -04:00
parent 8fa349ce63
commit 5c58886113
4 changed files with 12 additions and 17 deletions

View File

@ -28,8 +28,6 @@ Fixes bug #1081043
"""
import types # noqa
# NOTE(flaper87): This is bad but there ain't better way to do it.
from glance_store._drivers import swift # noqa
from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import encodeutils

View File

@ -3,11 +3,6 @@
# process, which may cause wedges in the gate later.
pbr<2.0,>=1.6
#
# The greenlet package must be compiled with gcc and needs
# the Python.h headers. Make sure you install the python-dev
# package to get the right headers...
greenlet>=0.3.2
# < 0.8.0/0.8 does not work, see https://bugs.launchpad.net/bugs/1153983
SQLAlchemy<1.1.0,>=0.9.9
@ -19,7 +14,6 @@ Routes!=2.0,>=1.12.3;python_version!='2.7'
WebOb>=1.2.3
sqlalchemy-migrate>=0.9.6
httplib2>=0.7.5
kombu>=3.0.7
pycrypto>=2.6
iso8601>=0.1.9
oslo.config>=2.3.0 # Apache-2.0
@ -32,14 +26,6 @@ futurist>=0.1.2 # Apache-2.0
taskflow>=1.16.0
keystonemiddleware>=2.0.0
WSME>=0.7
# For openstack/common/lockutils
posix-ipc
# For Swift storage backend.
python-swiftclient>=2.2.0
# For VMware storage backed.
oslo.vmware>=1.16.0 # Apache-2.0
# For paste.util.template used in keystone.common.template
Paste

View File

@ -21,6 +21,18 @@ classifier =
data_files =
etc/glance/metadefs = etc/metadefs/*
[extras]
cinder =
glance_store[cinder]>=0.7.1 # Apache-2.0
gridfs =
glance_store[gridfs]>=0.7.1 # Apache-2.0
swift =
glance_store[swift]>=0.7.1 # Apache-2.0
s3 =
glance_store[s3]>=0.7.1 # Apache-2.0
vmware =
glance_store[vmware]>=0.7.1 # Apache-2.0
[entry_points]
console_scripts =
glance-api = glance.cmd.api:main

View File

@ -10,7 +10,6 @@ Babel>=1.3
# Needed for testing
coverage>=3.6
discover
fixtures>=1.3.1
mox3>=0.7.0
mock>=1.2