summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2012-05-29 08:59:47 +0100
committerMark McLoughlin <markmc@redhat.com>2012-06-13 08:14:40 +0100
commitb2aa78b5588bf4bfb66951b868a3b641d2dd64e1 (patch)
treeafadef884abdf5c6b6899729ae9b9205abc8f626 /bin
parent84a7f3751088159035d89920fa8590aa206d65e5 (diff)
downloadkeystone-b2aa78b5588bf4bfb66951b868a3b641d2dd64e1.tar.gz
keystone-b2aa78b5588bf4bfb66951b868a3b641d2dd64e1.tar.xz
keystone-b2aa78b5588bf4bfb66951b868a3b641d2dd64e1.zip
Use cfg's new global CONF object
Implements blueprint cfg-global-object Change-Id: Ic53b41dafa8666ce21f33697f7e8697f1e5cb0fd
Diffstat (limited to 'bin')
-rwxr-xr-xbin/keystone-all2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/keystone-all b/bin/keystone-all
index 4767c258..fc499967 100755
--- a/bin/keystone-all
+++ b/bin/keystone-all
@@ -73,7 +73,7 @@ if __name__ == '__main__':
if os.path.exists(dev_conf):
config_files = [dev_conf]
- CONF(config_files=config_files, args=sys.argv)
+ CONF(project='keystone', default_config_files=config_files)
config.setup_logging(CONF)