diff options
| author | Dan Prince <dprince@redhat.com> | 2012-05-05 22:42:36 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2012-05-06 09:29:23 -0400 |
| commit | 9a9a28e80ae043bdf7476651ea8d92aedf0ba36c (patch) | |
| tree | 51bb8470f2f62a5d0889a4940b0304f01219eb40 /nova | |
| parent | eb9e54c1129080ad0f5b569b39dfa09c539f2f11 (diff) | |
| download | nova-9a9a28e80ae043bdf7476651ea8d92aedf0ba36c.tar.gz nova-9a9a28e80ae043bdf7476651ea8d92aedf0ba36c.tar.xz nova-9a9a28e80ae043bdf7476651ea8d92aedf0ba36c.zip | |
Fix a race with rpc.register_opts in service.py.
Fixes an issue in service.py where rpc.register_opts may not
get called before wait() accesses FLAGS... which can cause
NoneType exceptions with some versions of nova.conf.
Fixes LP Bug #995328.
Change-Id: Ib177c2a082a4cf1c22935c1e6fdf3ba714a33aca
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/service.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/service.py b/nova/service.py index d4c9cf683..7d5db5a0a 100644 --- a/nova/service.py +++ b/nova/service.py @@ -434,6 +434,7 @@ def serve(*servers): def wait(): LOG.debug(_('Full set of FLAGS:')) + rpc.register_opts(FLAGS) for flag in FLAGS: flag_get = FLAGS.get(flag, None) # hide flag contents from log if contains a password |