From fe50a2bb9e6b36cbb4f6d904bd986e0cdc2cb059 Mon Sep 17 00:00:00 2001
From: Russell Bryant <rbryant@redhat.com>
Date: Wed, 20 Feb 2013 16:22:59 -0500
Subject: Fix message envelope keys.

update.py from oslo-incubator broke the keys used in the rpc message
envelope.  This fixes it.

Change-Id: Idabd18720cad8c4469c5dc3ec1ffd20a3a39e897
---
 nova/openstack/common/rpc/common.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'nova')

diff --git a/nova/openstack/common/rpc/common.py b/nova/openstack/common/rpc/common.py
index 178e3fc19..55fc5b044 100644
--- a/nova/openstack/common/rpc/common.py
+++ b/nova/openstack/common/rpc/common.py
@@ -49,8 +49,8 @@ deserialize_msg().
 The current message format (version 2.0) is very simple.  It is:
 
     {
-        'nova.version': <RPC Envelope Version as a String>,
-        'nova.message': <Application Message Payload, JSON encoded>
+        'oslo.version': <RPC Envelope Version as a String>,
+        'oslo.message': <Application Message Payload, JSON encoded>
     }
 
 Message format version '1.0' is just considered to be the messages we sent
@@ -66,8 +66,8 @@ to the messaging libraries as a dict.
 '''
 _RPC_ENVELOPE_VERSION = '2.0'
 
-_VERSION_KEY = 'nova.version'
-_MESSAGE_KEY = 'nova.message'
+_VERSION_KEY = 'oslo.version'
+_MESSAGE_KEY = 'oslo.message'
 
 
 # TODO(russellb) Turn this on after Grizzly.
-- 
cgit