diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-05-13 06:51:18 -0700 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-05-13 06:51:18 -0700 |
| commit | 19386db034b6144544aaed72aeab7e562f0087bc (patch) | |
| tree | fa2b2d69f80034fe003b472054ad4d9bad499d1c /nova/utils.py | |
| parent | 31b9cb7b78df8d2d6c0d68f08031b5c3abc8a62e (diff) | |
| parent | 0576766cdf3480ad02159671d2dfc0bdcb154934 (diff) | |
| download | nova-19386db034b6144544aaed72aeab7e562f0087bc.tar.gz nova-19386db034b6144544aaed72aeab7e562f0087bc.tar.xz nova-19386db034b6144544aaed72aeab7e562f0087bc.zip | |
trunk merge
Diffstat (limited to 'nova/utils.py')
| -rw-r--r-- | nova/utils.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nova/utils.py b/nova/utils.py index 80bf1197f..b55e83e5a 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -232,9 +232,12 @@ def default_flagfile(filename='nova.conf'): # turn relative filename into an absolute path script_dir = os.path.dirname(inspect.stack()[-1][1]) filename = os.path.abspath(os.path.join(script_dir, filename)) - if os.path.exists(filename): - flagfile = ['--flagfile=%s' % filename] - sys.argv = sys.argv[:1] + flagfile + sys.argv[1:] + if not os.path.exists(filename): + filename = "./nova.conf" + if not os.path.exists(filename): + filename = '/etc/nova/nova.conf' + flagfile = ['--flagfile=%s' % filename] + sys.argv = sys.argv[:1] + flagfile + sys.argv[1:] def debug(arg): |