From 50cb85bd03a5fd0c98c473cc498cd92aeca4e68a Mon Sep 17 00:00:00 2001
From: fengchaoyang <fengchaoyang@unitedstack.com>
Date: Wed, 23 Nov 2016 19:35:26 +0800
Subject: [PATCH] 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
---
 README.rst                                | 10 +++++-----
 doc/source/guides/configuration_guide.rst |  6 +++---
 doc/source/guides/installation_guide.rst  |  2 +-
 tox.ini                                   |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.rst b/README.rst
index 1463ff978..bfd960518 100644
--- a/README.rst
+++ b/README.rst
@@ -102,9 +102,9 @@ an OpenStack environment.
 
     $ oslo-config-generator \
       --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::
 
     [oslo_messaging_rabbit]
@@ -118,7 +118,7 @@ an OpenStack environment.
     connection = mysql://<DB_USER>:<DB_PASSWORD>@localhost:3306/mistral
 
 #. 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]
     auth_enable = False
@@ -258,7 +258,7 @@ Debugging
 ~~~~~~~~~
 
 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]
   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*::
 
-  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::
 
diff --git a/doc/source/guides/configuration_guide.rst b/doc/source/guides/configuration_guide.rst
index 0d9a9c770..4a506b788 100644
--- a/doc/source/guides/configuration_guide.rst
+++ b/doc/source/guides/configuration_guide.rst
@@ -9,9 +9,9 @@ directory.
 
 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
    auth properties::
@@ -89,7 +89,7 @@ directory.
 
     connection = postgresql://<user>:<password>@<database-host>:5432/mistral
 
-9. **If you are not using OpenStack, skip this item.** 
+9. **If you are not using OpenStack, skip this item.**
    Update mistral/actions/openstack/mapping.json file which contains all allowed
    OpenStack actions, according to the specific client versions of OpenStack
    projects in your deployment. Please find more detailed information in
diff --git a/doc/source/guides/installation_guide.rst b/doc/source/guides/installation_guide.rst
index c38f61c1b..d44178110 100644
--- a/doc/source/guides/installation_guide.rst
+++ b/doc/source/guides/installation_guide.rst
@@ -42,7 +42,7 @@ Generate config::
 
     $ 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>`
 
 **Virtualenv installation**::
diff --git a/tox.ini b/tox.ini
index 54e39b621..700994a26 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,7 +38,7 @@ commands =
 [testenv:genconfig]
 commands =
     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.
 [testenv:venv]