summaryrefslogtreecommitdiffstats
path: root/nova/flags.py
diff options
context:
space:
mode:
authorGhe Rivero <ghe@debian.org>2012-05-01 14:34:55 +0200
committerGhe Rivero <ghe@debian.org>2012-05-10 19:17:34 +0200
commit7e3e9b8e9cea4f1bf78d127ffb915b79c854fdbe (patch)
tree64ebd1d2e4f30a3190285f6923722aca915e683a /nova/flags.py
parentd9ed81222048f589b6863aaf2a99983ba5a3094f (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/flags.py')
-rw-r--r--nova/flags.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/nova/flags.py b/nova/flags.py
index 652d3465d..5b7421afc 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -30,7 +30,6 @@ import os
import socket
import sys
-from nova.compat import flagfile
from nova.openstack.common import cfg
@@ -41,8 +40,7 @@ class NovaConfigOpts(cfg.CommonConfigOpts):
self.disable_interspersed_args()
def __call__(self, argv):
- with flagfile.handle_flagfiles_managed(argv[1:]) as args:
- return argv[:1] + super(NovaConfigOpts, self).__call__(args)
+ return argv[:1] + super(NovaConfigOpts, self).__call__(argv[1:])
FLAGS = NovaConfigOpts()