diff options
| author | Chris Behrens <cbehrens@codestud.com> | 2011-05-13 16:45:42 +0000 |
|---|---|---|
| committer | Chris Behrens <cbehrens@codestud.com> | 2011-05-13 16:45:42 +0000 |
| commit | be83d7317ee55ae0ef436f09f25beef2eccee5a6 (patch) | |
| tree | 87d4f53c8bd7c5c4056b131b3fc039ee0740f1d6 /nova/utils.py | |
| parent | 7dc76508d38370f3cf68029fae2ffb7749a580b2 (diff) | |
| parent | 0805521c79f934ba54f839be64a2c43ed177612d (diff) | |
| download | nova-be83d7317ee55ae0ef436f09f25beef2eccee5a6.tar.gz nova-be83d7317ee55ae0ef436f09f25beef2eccee5a6.tar.xz nova-be83d7317ee55ae0ef436f09f25beef2eccee5a6.zip | |
Merged trunk
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 44ee1b623..0c469b1de 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): |