openstack/zaqar
Code Issues Proposed changes

Merge "chore: Remove remaining proxy cruft"

Browse Source
This commit is contained in:
Jenkins 2013-12-09 21:20:40 +00:00 committed by Gerrit Code Review
commit 9c87eb244d
3 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.rst
View File

@ -18,18 +18,17 @@ installed and running.
2. Copy the Marconi config files to the directory ``~/.marconi``:: 2. Copy the Marconi config files to the directory ``~/.marconi``::
$ cp marconi/etc/marconi-proxy.conf-sample ~/.marconi/marconi-proxy.conf $ cp marconi/etc/marconi.conf-sample ~/.marconi/marconi.conf
$ cp marconi/etc/marconi-queues.conf-sample ~/.marconi/marconi-queues.conf
$ cp marconi/etc/logging.conf-sample ~/.marconi/logging.conf $ cp marconi/etc/logging.conf-sample ~/.marconi/logging.conf
3. Find the ``[drivers:storage:mongodb]`` section in 3. Find the ``[drivers:storage:mongodb]`` section in
``~/.marconi/marconi-queues.conf`` and modify the URI to point ``~/.marconi/marconi.conf`` and modify the URI to point
to your local mongod instance:: to your local mongod instance::
uri = mongodb://$MONGODB_HOST:$MONGODB_PORT uri = mongodb://$MONGODB_HOST:$MONGODB_PORT
4. For logging, find the ``[DEFAULT]`` section in 4. For logging, find the ``[DEFAULT]`` section in
``~/.marconi/marconi-queues.conf`` and modify as desired:: ``~/.marconi/marconi.conf`` and modify as desired::
log_file = server.log log_file = server.log

6
etc/marconi-queues.conf-sample → etc/marconi.conf-sample
View File

@ -1,6 +1,6 @@
# By default, this should line in one of: # By default, this should line in one of:
# ~/.marconi/marconi-queues.conf # ~/.marconi/marconi.conf
# /etc/marconi/marconi-queues.conf # /etc/marconi/marconi.conf
[DEFAULT] [DEFAULT]
# Show more verbose log output (sets INFO log level output) # Show more verbose log output (sets INFO log level output)
@ -9,7 +9,7 @@
# Show debugging output in logs (sets DEBUG log level output) # Show debugging output in logs (sets DEBUG log level output)
;debug = False ;debug = False
# Log to this file! # Log to this file
log_file = /var/log/marconi/queues.log log_file = /var/log/marconi/queues.log
;auth_strategy = ;auth_strategy =

12
setup.cfg
View File

@ -46,20 +46,8 @@ marconi.common.cache.backends =
memory = marconi.common.cache._backends.memory:MemoryBackend memory = marconi.common.cache._backends.memory:MemoryBackend
memcached = marconi.common.cache._backends.memcached:MemcachedBackend 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.public.transport =
wsgi = marconi.proxy.transport.wsgi.public.driver:Driver
marconi.proxy.admin.transport =
wsgi = marconi.proxy.transport.wsgi.admin.driver:Driver
[nosetests] [nosetests]
where=tests where=tests
; TODO(kgriffs): Remove this exclusion once proxy code is removed or fixed
exclude=.*proxy.*
verbosity=2 verbosity=2
with-doctest = true with-doctest = true