08c639019c
This patch adds smarter configuration to the proxy in two steps: 1. mirror the transport implementation used in marconi.queues in marconi.proxy 2. add a bootstrap file to take care of start up Rationale: make configuration work, make deploying easy, make alternate transport implementations feasible. Another change: the unit tests are fixed by adding a few changes: 1. add drop functionality to the proxy storage interface 2. use drop/flush in test suite tearDown 3. rm tests.unit.test_config 4. delete queues at the end of the catalogue test (not yet robust) The rationale for (3) was that test_config did not play nice with other tests when they were registering their options, and failed as a result. Furthermore, we should not need to test oslo.config. Configuration changes: new fields in etc/marconi.conf - drivers:proxy - drivers:proxy:storage:{memory.mongodb} - drivers:proxy:transport:wsgi - oslo_cache Also, fix: InternalServerError -> HTTPInternalServerError Finally, redis was removed from requirements.txt. Change-Id: If2365a1a738a3975fe6bde7bd07dfdee3460cecd Implements: blueprint placement-service
67 lines
1.8 KiB
INI
67 lines
1.8 KiB
INI
[metadata]
|
|
name = marconi
|
|
version = 2013.2
|
|
summary = OpenStack Queuing and Notification Service
|
|
description-file =
|
|
README.rst
|
|
author = OpenStack
|
|
author-email = openstack-dev@lists.openstack.org
|
|
home-page = http://www.openstack.org/
|
|
classifier =
|
|
Environment :: OpenStack
|
|
Intended Audience :: Information Technology
|
|
Intended Audience :: System Administrators
|
|
License :: OSI Approved :: Apache Software License
|
|
Operating System :: POSIX :: Linux
|
|
Programming Language :: Python
|
|
Programming Language :: Python :: 2
|
|
Programming Language :: Python :: 2.7
|
|
Programming Language :: Python :: 2.6
|
|
|
|
[files]
|
|
packages =
|
|
marconi
|
|
|
|
[entry_points]
|
|
console_scripts =
|
|
marconi-server = marconi.cmd.server:run
|
|
|
|
marconi.queues.storage =
|
|
sqlite = marconi.queues.storage.sqlite.driver:Driver
|
|
mongodb = marconi.queues.storage.mongodb.driver:Driver
|
|
|
|
marconi.queues.transport =
|
|
wsgi = marconi.queues.transport.wsgi.driver:Driver
|
|
|
|
marconi.common.cache.backends =
|
|
memory = marconi.common.cache._backends.memory:MemoryBackend
|
|
memcached = marconi.common.cache._backends.memcached:MemcachedBackend
|
|
|
|
marconi.proxy.storage =
|
|
memory = marconi.proxy.storage.memory.driver:Driver
|
|
mongodb = marconi.proxy.storage.mongodb.driver:Driver
|
|
|
|
marconi.proxy.transport =
|
|
wsgi = marconi.proxy.transport.wsgi.driver:Driver
|
|
|
|
[nosetests]
|
|
where=tests
|
|
verbosity=2
|
|
|
|
with-doctest = true
|
|
|
|
cover-package = marconi
|
|
cover-html = true
|
|
cover-erase = true
|
|
cover-inclusive = true
|
|
|
|
; Disabled: Causes a bug in testtools to manifest.
|
|
; Trigger: self.assertX(condition), where condition == False.
|
|
;
|
|
; In "testtools/testresult/real.py" the traceback is set to
|
|
; None in _details_to_exc_info(), but the inspect_traceback()
|
|
; method in nose/inspector.py requires a traceback-like object.
|
|
;
|
|
; detailed-errors = 1
|
|
|