summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDolph Mathews <dolph.mathews@gmail.com>2011-09-30 13:46:38 -0500
committerDolph Mathews <dolph.mathews@gmail.com>2011-09-30 13:46:38 -0500
commitb46b023b22336834b6a032a490c3f9fa35fcde9b (patch)
tree46c0b83f96f9dfe86f5b185c891c14981906cbb7
parentd800ed2791d6e8bda6393dcd2a2678c7eccdab6c (diff)
downloadkeystone-b46b023b22336834b6a032a490c3f9fa35fcde9b.tar.gz
keystone-b46b023b22336834b6a032a490c3f9fa35fcde9b.tar.xz
keystone-b46b023b22336834b6a032a490c3f9fa35fcde9b.zip
Shouldn't look in /etc/init/ for config files
Change-Id: Iedf372e8942ddc0c924c0e0c0708d41412a13d68
-rwxr-xr-xkeystone/common/config.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/keystone/common/config.py b/keystone/common/config.py
index 4803ebfe..84207dc9 100755
--- a/keystone/common/config.py
+++ b/keystone/common/config.py
@@ -191,7 +191,6 @@ def find_config_file(options, args):
* ~.keystone/
* ~
* /etc/keystone
- * /etc/init
* /etc
:if no config file is given get from possible_topdir/etc/keystone.conf
@@ -214,7 +213,6 @@ def find_config_file(options, args):
fix_path(os.path.join('~', '.keystone')),
fix_path('~'),
'/etc/keystone/',
- '/etc/init/',
'/etc']
for cfg_dir in config_file_dirs: