Merge "Move config-generator to tools"

2017-08-24 19:25:37 +00:00 · 2017-08-24 19:25:37 +00:00 · 406527a1e1
commit 406527a1e1
parent 8c2f4876f5 d3abafdee4
5 changed files with 3 additions and 3 deletions
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@ -63,7 +63,7 @@ extensions = ['sphinx.ext.autodoc',
              ]

 config_generator_config_file = (
-    '../../cinder/config/cinder-config-generator.conf')
+    '../../tools/config/cinder-config-generator.conf')
 sample_config_basename = '_static/cinder'

 # autodoc generation is a bit aggressive and a nuisance
--- a/cinder/config/init.py
+++ b/cinder/config/init.py
--- a/cinder/config/cinder-config-generator.conf
+++ b/cinder/config/cinder-config-generator.conf
--- a/cinder/config/generate_cinder_opts.py
+++ b/cinder/config/generate_cinder_opts.py
--- a/tox.ini
+++ b/tox.ini
@ -81,12 +81,12 @@ commands =
 [testenv:genconfig]
 sitepackages = False
 envdir = {toxworkdir}/pep8
-commands = oslo-config-generator --config-file=cinder/config/cinder-config-generator.conf
+commands = oslo-config-generator --config-file=tools/config/cinder-config-generator.conf

 [testenv:genopts]
 sitepackages = False
 envdir = {toxworkdir}/pep8
-commands = python cinder/config/generate_cinder_opts.py
+commands = python tools/config/generate_cinder_opts.py

 [testenv:venv]
 commands = {posargs}