openstack
/
mistral
Code Issues Proposed changes

Fix the default configuration file path 

According to the habit of openstack project, the project configuration files
are generally placed in a fixed directory(/etc/project/project.conf).

Change-Id: I028a5d31e1879c4257aa523df6f56eafdb664e0d
This commit is contained in:
fengchaoyang 2016-11-23 19:35:26 +08:00
parent f26c15052f
commit 50cb85bd03
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.rst
View File

@ -102,9 +102,9 @@ an OpenStack environment.
$ oslo-config-generator \ $ oslo-config-generator \
--config-file tools/config/config-generator.mistral.conf \ --config-file tools/config/config-generator.mistral.conf \
--output-file etc/mistral.conf --output-file /etc/mistral/mistral.conf
#. Edit file ``etc/mistral.conf`` according to your setup. Pay attention to #. Edit file ``/etc/mistral/mistral.conf`` according to your setup. Pay attention to
the following sections and options:: the following sections and options::
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
@ -118,7 +118,7 @@ an OpenStack environment.
connection = mysql://<DB_USER>:<DB_PASSWORD>@localhost:3306/mistral connection = mysql://<DB_USER>:<DB_PASSWORD>@localhost:3306/mistral
#. If you are not using OpenStack, add the following entry to the #. If you are not using OpenStack, add the following entry to the
``/etc/mistral.conf`` file and **skip the following steps**:: ``/etc/mistral/mistral.conf`` file and **skip the following steps**::
[pecan] [pecan]
auth_enable = False auth_enable = False
@ -258,7 +258,7 @@ Debugging
~~~~~~~~~ ~~~~~~~~~
To debug using a local engine and executor without dependencies such as To debug using a local engine and executor without dependencies such as
RabbitMQ, make sure your ``etc/mistral.conf`` has the following settings:: RabbitMQ, make sure your ``/etc/mistral/mistral.conf`` has the following settings::
[DEFAULT] [DEFAULT]
rpc_backend = fake rpc_backend = fake
@ -268,7 +268,7 @@ RabbitMQ, make sure your ``etc/mistral.conf`` has the following settings::
and run the following command in *pdb*, *PyDev* or *PyCharm*:: and run the following command in *pdb*, *PyDev* or *PyCharm*::
mistral/cmd/launch.py --server all --config-file etc/mistral.conf --use-debugger mistral/cmd/launch.py --server all --config-file /etc/mistral/mistral.conf --use-debugger
.. note:: .. note::

4
doc/source/guides/configuration_guide.rst
View File

@ -9,9 +9,9 @@ directory.
1. Generate *mistral.conf* (if it does not already exist):: 1. Generate *mistral.conf* (if it does not already exist)::
$ oslo-config-generator --config-file tools/config/config-generator.mistral.conf --output-file etc/mistral.conf $ oslo-config-generator --config-file tools/config/config-generator.mistral.conf --output-file /etc/mistral/mistral.conf
2. Edit file **etc/mistral.conf**. 2. Edit file **/etc/mistral/mistral.conf**.
3. **If you are not using OpenStack, skip this item.** Provide valid keystone 3. **If you are not using OpenStack, skip this item.** Provide valid keystone
auth properties:: auth properties::

2
doc/source/guides/installation_guide.rst
View File

@ -42,7 +42,7 @@ Generate config::
$ tox -egenconfig $ tox -egenconfig
Configure Mistral as needed. The configuration file is located in ``etc/mistral.conf``. Configure Mistral as needed. The configuration file is located in ``/etc/mistral/mistral.conf``.
For details see :doc:`Mistral Configuration Guide </guides/configuration_guide>` For details see :doc:`Mistral Configuration Guide </guides/configuration_guide>`
**Virtualenv installation**:: **Virtualenv installation**::

2
tox.ini
View File

@ -38,7 +38,7 @@ commands =
[testenv:genconfig] [testenv:genconfig]
commands = commands =
oslo-config-generator --config-file tools/config/config-generator.mistral.conf \ oslo-config-generator --config-file tools/config/config-generator.mistral.conf \
--output-file etc/mistral.conf.sample --output-file /etc/mistral/mistral.conf.sample
#set PYTHONHASHSEED=0 to prevent wsmeext.sphinxext from randomly failing. #set PYTHONHASHSEED=0 to prevent wsmeext.sphinxext from randomly failing.
[testenv:venv] [testenv:venv]