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
This commit is contained in:
parent
eb9e54c112
commit
9a9a28e80a
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue