diff --git a/nova/service.py b/nova/service.py
index d4c9cf683b9c..7d5db5a0a73e 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