Ensures that keys for context from the queue are passed to the context constructor as strings. This prevents hangs on older versions of python that can't handle unicode kwargs.

1 files changed, 3 insertions, 0 deletions

diff --git a/nova/rpc.py b/nova/rpc.py
index 895820cd0..05eaa0f99 100644
--- a/nova/rpc.py
+++ b/nova/rpc.py
@@ -262,6 +262,9 @@ def _unpack_context(msg):
     """Unpack context from msg."""
     context_dict = {}
     for key in list(msg.keys()):
+        # NOTE(vish): Some versions of python don't like unicode keys
+        #             in kwargs.
+        key = str(key)
         if key.startswith('_context_'):
             value = msg.pop(key)
             context_dict[key[9:]] = value