From 9a9a28e80ae043bdf7476651ea8d92aedf0ba36c Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Sat, 5 May 2012 22:42:36 -0400
Subject: 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
---
 nova/service.py | 1 +
 1 file changed, 1 insertion(+)

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
-- 
cgit