summaryrefslogtreecommitdiffstats
path: root/openstack-common.conf
diff options
context:
space:
mode:
authorJohannes Erdfelt <johannes.erdfelt@rackspace.com>2012-03-23 22:00:49 +0000
committerJohannes Erdfelt <johannes.erdfelt@rackspace.com>2012-03-23 22:10:22 +0000
commitda1a151dfc9ffcb8591fa0972db0a769bd86668a (patch)
tree47b7bfde9df742076950cd8a8b057a831dda823f /openstack-common.conf
parent6249d6c1f6c8548d3a867eb0357e5c1c1094ccf1 (diff)
downloadnova-da1a151dfc9ffcb8591fa0972db0a769bd86668a.tar.gz
nova-da1a151dfc9ffcb8591fa0972db0a769bd86668a.tar.xz
nova-da1a151dfc9ffcb8591fa0972db0a769bd86668a.zip
Import recent openstack-common changes
Fixes MultiStrOpt, plus also adds secret kwarg for sanitizing logs Change-Id: I87b979b38084f82b012872054262fc49d291e99e
Diffstat (limited to 'openstack-common.conf')
-rw-r--r--openstack-common.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/openstack-common.conf b/openstack-common.conf
index ab5c2fa8c..bc191b959 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -1,7 +1,7 @@
[DEFAULT]
# The list of modules to copy from openstack-common
-modules=cfg
+modules=cfg,iniparser
# The base module to hold the copy of openstack.common
base=nova