diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-16 22:27:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-16 22:27:36 +0000 |
| commit | 5d90b39c36e8e8e1db82318e1d43129a8d2e1108 (patch) | |
| tree | 8fa714df0ed7ffb38d5906e0f16308c3a86a3d9d /nova/flags.py | |
| parent | 3f9c617f6e801b322470dadd53da8f89406d5cf9 (diff) | |
| parent | 7e3e9b8e9cea4f1bf78d127ffb915b79c854fdbe (diff) | |
Merge "Remove old flagfile support."
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/nova/flags.py b/nova/flags.py index 83a3c8535..337dc979c 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 @@ -43,8 +42,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() |