diff --git a/etc/higgins/README-higgins.conf.txt b/etc/higgins/README-higgins.conf.txt deleted file mode 100644 index 228daee06..000000000 --- a/etc/higgins/README-higgins.conf.txt +++ /dev/null @@ -1,12 +0,0 @@ -To generate the sample higgins.conf file, run the following -command from the top level of the higgins directory: - -tox -egenconfig - -Or you can generate the sample higgins.conf file in global -environment, run the following command from the top level -of the higgins directory: - -pip install oslo.config -oslo-config-generator --config-file \ - etc/higgins/higgins-config-generator.conf diff --git a/tools/README-higgins.conf.txt b/tools/README-higgins.conf.txt new file mode 100644 index 000000000..ac678b184 --- /dev/null +++ b/tools/README-higgins.conf.txt @@ -0,0 +1,12 @@ +To generate the sample higgins.conf file, run gen-config tools +from the top level of the higgins directory: + +tools/gen-config + +Or run the following command from the top level of the +higgins directory: + +tox -egenconfig + +Generated sample configuration file will be put into etc/higgins/ +directory. diff --git a/tools/gen-config b/tools/gen-config new file mode 100755 index 000000000..f257e86ad --- /dev/null +++ b/tools/gen-config @@ -0,0 +1,3 @@ +#!/bin/sh + +oslo-config-generator --config-file=tools/higgins-config-generator.conf diff --git a/etc/higgins/higgins-config-generator.conf b/tools/higgins-config-generator.conf similarity index 100% rename from etc/higgins/higgins-config-generator.conf rename to tools/higgins-config-generator.conf diff --git a/tox.ini b/tox.ini index 31eef0da5..de86206df 100644 --- a/tox.ini +++ b/tox.ini @@ -91,5 +91,6 @@ install_command = pip install -U --force-reinstall {opts} {packages} commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html [testenv:genconfig] +envdir = {toxworkdir}/venv commands = - oslo-config-generator --config-file etc/higgins/higgins-config-generator.conf + {toxinidir}/tools/gen-config