From 4b77186a757bf7c8b3864e7718d776aa47a8f5af Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Fri, 21 Apr 2017 20:20:51 +0200 Subject: [PATCH] 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 --- {etc => config-generator}/keystone-policy-generator.conf | 0 doc/source/conf.py | 4 +++- tox.ini | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) rename {etc => config-generator}/keystone-policy-generator.conf (100%) diff --git a/etc/keystone-policy-generator.conf b/config-generator/keystone-policy-generator.conf similarity index 100% rename from etc/keystone-policy-generator.conf rename to config-generator/keystone-policy-generator.conf diff --git a/doc/source/conf.py b/doc/source/conf.py index 4dc3c47dc0..c2b9148f84 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -59,7 +59,9 @@ extensions = ['sphinx.ext.autodoc', 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 index 79a83b23c0..db00a2af45 100644 --- 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 =