From 83e2431b35bb6874f4a37a16590cc449808f5c5f Mon Sep 17 00:00:00 2001 From: tengqm Date: Sun, 18 Dec 2016 21:40:54 -0500 Subject: [PATCH] Fix configuration generator The current behavior of 'genconfig' is writing file 'mistral.conf.sample' directly to the '/etc/mistral' directory. This has two problems: the /etc/mistral directory may and may not exist; we are supposed to write a usable configuration file into the '/etc/mistral' directory instead of a sample file. This patch redirects the output path to the local 'etc' subdirectory. Developers/users can then tune and install the configuration file based on the sample. Change-Id: I0c75ab9ffc9960ba12ce6f5d725c0c7bb78ef238 --- doc/source/guides/installation_guide.rst | 4 +++- tox.ini | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/source/guides/installation_guide.rst b/doc/source/guides/installation_guide.rst index d44178110..92909d818 100644 --- a/doc/source/guides/installation_guide.rst +++ b/doc/source/guides/installation_guide.rst @@ -42,7 +42,9 @@ Generate config:: $ tox -egenconfig -Configure Mistral as needed. The configuration file is located in ``/etc/mistral/mistral.conf``. +Configure Mistral as needed. The configuration file is located in +``etc/mistral.conf.sample``. You will need to modify the configuration options +and then copy it into ``/etc/mistral/mistral.conf``. For details see :doc:`Mistral Configuration Guide ` **Virtualenv installation**:: diff --git a/tox.ini b/tox.ini index 29867caa3..87c5adcac 100644 --- a/tox.ini +++ b/tox.ini @@ -43,7 +43,7 @@ commands = [testenv:genconfig] commands = oslo-config-generator --config-file tools/config/config-generator.mistral.conf \ - --output-file /etc/mistral/mistral.conf.sample + --output-file etc/mistral.conf.sample #set PYTHONHASHSEED=0 to prevent wsmeext.sphinxext from randomly failing. [testenv:venv]