diff options
| author | Ghe Rivero <ghe@debian.org> | 2012-05-01 14:34:55 +0200 |
|---|---|---|
| committer | Ghe Rivero <ghe@debian.org> | 2012-05-10 19:17:34 +0200 |
| commit | 7e3e9b8e9cea4f1bf78d127ffb915b79c854fdbe (patch) | |
| tree | 64ebd1d2e4f30a3190285f6923722aca915e683a /nova/utils.py | |
| parent | d9ed81222048f589b6863aaf2a99983ba5a3094f (diff) | |
Remove old flagfile support.
Implements blueprint remove-old-flagfile
nova-manage can still be used to convert old flagfiles style files
to new .ini files:
$ ./bin/nova-manage config convert --help
Usage: nova-manage config convert <args> [options]
Options:
-h, --help show this help message and exit
--infile=<path> old-style flagfile to convert to config
--outfile=<path> path for output file. Writes configto stdout if not
specified.
Change-Id: Ib8fbbd858b1db7faef70d7d97955e5042bf378f2
Signed-off-by: Ghe Rivero <ghe@debian.org>
Diffstat (limited to 'nova/utils.py')
| -rw-r--r-- | nova/utils.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nova/utils.py b/nova/utils.py index 69011fb61..bf50ea4e3 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -309,12 +309,12 @@ def novadir(): return os.path.abspath(nova.__file__).split('nova/__init__.py')[0] -def default_flagfile(filename='nova.conf', args=None): +def default_cfgfile(filename='nova.conf', args=None): if args is None: args = sys.argv for arg in args: - if arg.find('flagfile') != -1: - return arg[arg.index('flagfile') + len('flagfile') + 1:] + if arg.find('config-file') != -1: + return arg[arg.index('config-file') + len('config-file') + 1:] else: if not os.path.isabs(filename): # turn relative filename into an absolute path @@ -325,8 +325,8 @@ def default_flagfile(filename='nova.conf', args=None): if not os.path.exists(filename): filename = '/etc/nova/nova.conf' if os.path.exists(filename): - flagfile = '--flagfile=%s' % filename - args.insert(1, flagfile) + cfgfile = '--config-file=%s' % filename + args.insert(1, cfgfile) return filename |