Merge "Optionally add message envelope to notifications."

1 files changed, 4 insertions, 4 deletions

diff --git a/openstack/common/rpc/common.py b/openstack/common/rpc/common.py
index 7434a2d..8af2f03 100644
--- a/openstack/common/rpc/common.py
+++ b/openstack/common/rpc/common.py
@@ -414,8 +414,8 @@ def version_is_compatible(imp_version, version):
     return True
 
 
-def serialize_msg(raw_msg):
-    if not _SEND_RPC_ENVELOPE:
+def serialize_msg(raw_msg, force_envelope=False):
+    if not _SEND_RPC_ENVELOPE and not force_envelope:
         return raw_msg
 
     # NOTE(russellb) See the docstring for _RPC_ENVELOPE_VERSION for more
@@ -442,8 +442,8 @@ def deserialize_msg(msg):
     #      If so, great!
     #
     #   b) If it doesn't look like a standard message envelope, it could either
-    #      be a notification (which we don't wrap), or a message from before
-    #      we added a message envelope (referred to as version 1.0).
+    #      be a notification, or a message from before we added a message
+    #      envelope (referred to as version 1.0).
     #      Just return the message as-is.
     #
     # 2) It's any other non-dict type.  Just return it and hope for the best.