From 2a3d4b30a7563ba97f29b1c20393e3713463c045 Mon Sep 17 00:00:00 2001 From: Brant Knudson Date: Fri, 15 May 2015 10:10:28 -0500 Subject: [PATCH] Rename sample_config to genconfig Most OpenStack projects use genconfig, so use that as our tox venv. Change-Id: I2edb5503a114b38fc4c719140fbee935b6b757e6 --- doc/source/developing.rst | 6 +++--- tox.ini | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/source/developing.rst b/doc/source/developing.rst index dd6cc98fa..f7c5dc254 100644 --- a/doc/source/developing.rst +++ b/doc/source/developing.rst @@ -471,18 +471,18 @@ generated based upon all of the options available within Keystone. These options are sourced from the many files around Keystone as well as some external libraries. If new options are added, primarily located in ``keystone.common.config``, a new -sample configuration file needs to be generated. Generating a new sample configuration +sample configuration file needs to be generated. To generate a new sample configuration to be included in a commit run: .. code-block:: bash - $ tox -esample_config -r + $ tox -egenconfig -r The tox command will place an updated sample config in ``etc/keystone.conf.sample``. If there is a new external library (e.g. ``oslo.messaging``) that utilizes the ``oslo.config`` package for configuration, it can be added to the list of libraries -found in ``tools/config/oslo.config.generator.rc``. +found in ``config-generator/keystone.conf``. Translated responses diff --git a/tox.ini b/tox.ini index fa0465ced..8bd32cd27 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] minversion = 1.6 skipsdist = True -envlist = py27,py33,py34,pep8,docs,sample_config +envlist = py27,py33,py34,pep8,docs,genconfig [testenv] usedevelop = True @@ -111,7 +111,7 @@ max-complexity=24 commands= python setup.py build_sphinx -[testenv:sample_config] +[testenv:genconfig] commands = oslo-config-generator --config-file=config-generator/keystone.conf [testenv:bandit]