openstack/zaqar
Code Issues Proposed changes

cleanup: remove proxy cruft

Browse Source 
This patch removes some configuration files that were leftover from
the days of the proxy. Also, it removes mention of the proxy from
common.transport.version.

Change-Id: I88f7d6490f5b0d0bdbdc827c69a72180ab6c3a12
This commit is contained in:
Alejandro Cabrera 2013-12-02 13:39:33 -05:00
parent d7bb612988
commit f9d8ebd060
4 changed files with 1 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
etc/marconi-proxy.conf-sample
View File

@ -1,43 +0,0 @@
# By default, this should line in one of:
# ~/.marconi/marconi-proxy.conf
# /etc/marconi/marconi-proxy.conf
[DEFAULT]
# Show more verbose log output (sets INFO log level output)
;verbose = False
# Show debugging output in logs (sets DEBUG log level output)
;debug = False
# Log to this file!
log_file = /var/log/marconi/proxy.log
;auth_strategy =
# ================= Syslog Options ============================
# Send logs to syslog (/dev/log) instead of to file specified
# by `log_file`
;use_syslog = False
# Facility to use. If unset defaults to LOG_USER.
;syslog_log_facility = LOG_LOCAL0
# Transport driver module (e.g., wsgi, zmq)
# Storage driver module (e.g., mongodb, sqlite)
[drivers]
transport = wsgi
storage = mongodb
[drivers:transport:wsgi]
;bind = 0.0.0.0
;port = 8889
[drivers:storage:mongodb]
uri = mongodb://db1.example.net,db2.example.net:2500/?replicaSet=test&ssl=true&w=majority
database = marconi_proxy
[oslo_cache]
;cache_backend = memcached
;cache_prefix = my_namespace

2
marconi/common/transport/version.py
View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
"""version: version information for the proxy transport API."""
"""version: version information for the transport API."""
def info():

10
tests/etc/wsgi_proxy_memory.conf
View File

@ -1,10 +0,0 @@
[DEFAULT]
debug = False
verbose = False
[drivers]
transport = wsgi
storage = memory
[drivers:transport:wsgi]
port = 8888

14
tests/etc/wsgi_proxy_mongodb.conf
View File

@ -1,14 +0,0 @@
[DEFAULT]
debug = False
verbose = False
[drivers]
transport = wsgi
storage = mongodb
[drivers:transport:wsgi]
port = 8888
[drivers:storage:mongodb]
uri = mongodb://127.0.0.1:27017
database = marconi_proxy_test