summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorLin Tan <lin.tan@intel.com>2015-03-10 17:03:40 +0800
committerLin Tan <lin.tan@intel.com>2015-03-19 13:56:34 +0800
commit1be0fd0a8e769b2719053b2ed243e50fb2f211d3 (patch)
treea791471b7ba956f701cd8f2a21317212719778c9 /tools
parent918013bd00bb110cd7aac36e0f5fe08910be30dd (diff)
downloadironic-1be0fd0a8e769b2719053b2ed243e50fb2f211d3.tar.gz
Generate keystone_authtoken options in sample config file
Adding keystonemiddleware.authtoken as extra libraries to register its missing options, like admin_user. Update sample conf by running 'tools/config/generate_sample.sh' Closes-Bug: #1430115 Change-Id: Ic8666dc4a3a6b7c5855afb2929d8b14ebe21ca52
Diffstat (limited to 'tools')
-rw-r--r--tools/config/oslo.config.generator.rc4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/config/oslo.config.generator.rc b/tools/config/oslo.config.generator.rc
index 0e1325b9c..e224cf753 100644
--- a/tools/config/oslo.config.generator.rc
+++ b/tools/config/oslo.config.generator.rc
@@ -1,2 +1,2 @@
-export IRONIC_CONFIG_GENERATOR_EXTRA_LIBRARIES='oslo.db oslo.messaging'
-export IRONIC_CONFIG_GENERATOR_EXTRA_MODULES=keystonemiddleware.auth_token
+export IRONIC_CONFIG_GENERATOR_EXTRA_LIBRARIES='oslo.db oslo.messaging keystonemiddleware.auth_token'
+export IRONIC_CONFIG_GENERATOR_EXTRA_MODULES=