Move policy generator config to config-generator/

etc/ is for config files that should be installed on disk to support a running keystone. config-generator/ is for files that oslo-config-generator uses to generate sample config files and are not needed by keystone in a live deployment. Change-Id: I0614709ded739d77ec620150bcb6c2f456024b6f
openstack · Apr 21, 2017 · 4b77186 · 4b77186
1 parent ca70982
commit 4b77186
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/etc/keystone-policy-generator.conf → ...-generator/keystone-policy-generator.conf b/etc/keystone-policy-generator.conf → ...-generator/keystone-policy-generator.conf
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -59,7 +59,9 @@
 config_generator_config_file = '../../config-generator/keystone.conf'
 sample_config_basename = '_static/keystone'
 
-policy_generator_config_file = '../../etc/keystone-policy-generator.conf'
+policy_generator_config_file = (
+    '../../config-generator/keystone-policy-generator.conf'
+)
 sample_policy_basename = '_static/keystone'
 
 todo_include_todos = True

diff --git a/tox.ini b/tox.ini
@@ -124,7 +124,7 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen
 commands = oslo-config-generator --config-file=config-generator/keystone.conf
 
 [testenv:genpolicy]
-commands = oslopolicy-sample-generator --config-file etc/keystone-policy-generator.conf
+commands = oslopolicy-sample-generator --config-file config-generator/keystone-policy-generator.conf
 
 [hacking]
 import_exceptions =