x
/
mixmatch
Code Issues Proposed changes

Rename k2k-proxy.conf file to mixmatch.conf 

Configuration file for proxy changed from /etc/k2k-proxy.conf to
/etc/mixmatch/mixmatch.conf. Updated documentation to point to the
new file.

Change-Id: I4e03f020880d01e8242cf53d1e08f21f74b9d058
Closes-bug: 1640231
This commit is contained in:
Ubuntu 2016-11-18 22:15:49 +00:00 committed by Eric Juma
parent c9f7da99a3
commit 042146da27
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/source/installation.rst
View File

@ -32,16 +32,16 @@ To run the proxy with Apache in Ubuntu: ::
$ apt-get install libapache2-mod-wsgi
$ cp httpd/apache.conf /etc/apache2/sites-available/proxy.conf
$ cp etc/k2k-proxy.conf /etc/
$ cp etc/mixmatch.conf.sample /etc/mixmatch/mixmatch.conf
$ a2ensite proxy
$ service apache2 reload
Configuration
=============
The proxy searches for the configuration file ``k2k-proxy.conf`` in the
current directory, the ``etc/`` directory relative to the current directory or
``/etc/``
The proxy searches for the configuration file ``mixmatch.conf`` in the
current directory, the ``etc/mixmatch`` directory relative to the current directory or
``/etc/mixmatch``
A sample configuration file has been provided in the ``etc`` folder of the
source code.
@ -49,7 +49,7 @@ source code.
The proxy will substitute the endpoint of the service it is proxying.
Only Cinder and Glance are supported for now.
For each SP, you must have a section in ``k2k-proxy.conf`` which contains the
For each SP, you must have a section in ``mixmatch.conf`` which contains the
service provider name (as it is listed in Keystone's service catalog), and the
URI for connecting to the notification messagebus in that OpenStack
installation. For instance::

0
etc/k2k-proxy.conf → etc/mixmatch.conf.sample
View File

6
mixmatch/config.py
View File

@ -110,9 +110,9 @@ MEMOIZE_SESSION = cache.get_memoization_decorator(
def load_config():
"""Load parameters from the proxy's config file."""
conf_files = [f for f in ['k2k-proxy.conf',
'etc/k2k-proxy.conf',
'/etc/k2k-proxy.conf'] if path.isfile(f)]
conf_files = [f for f in ['mixmatch.conf',
'etc/mixmatch/mixmatch.conf',
'/etc/mixmatch/mixmatch.conf'] if path.isfile(f)]
if conf_files is not []:
CONF(default_config_files=conf_files)