Update to oslo.context

This update oslo-incubator and move to the new oslo.context module.

Change-Id: I06a1a400e0d37609f824dcdabd460b0fd86ea0f2

openstack-common.conf

@@ -1,7 +1,4 @@
 [DEFAULT]
 
-# The list of modules to copy from oslo-incubator.git
-module=context
-
 # The base module to hold the copy of openstack.common
-base=oslo.messaging
+base=oslo_messaging

oslo_messaging/notify/middleware.py

@@ -22,6 +22,7 @@ import sys
 import traceback as tb
 
 from oslo_config import cfg
+from oslo_context import context
 from oslo_middleware import base
 import six
 import webob.dec
@@ -29,7 +30,6 @@ import webob.dec
 import oslo_messaging
 from oslo_messaging._i18n import _LE
 from oslo_messaging import notify
-from oslo_messaging.openstack.common import context
 
 LOG = logging.getLogger(__name__)
 

requirements-py3.txt

@@ -3,6 +3,7 @@
 # process, which may cause wedges in the gate later.
 
 oslo.config>=1.9.0  # Apache-2.0
+oslo.context>=0.2.0                     # Apache-2.0
 oslo.serialization>=1.2.0               # Apache-2.0
 oslo.utils>=1.2.0                       # Apache-2.0
 oslo.i18n>=1.3.0  # Apache-2.0

requirements.txt

@@ -5,6 +5,7 @@
 pbr>=0.6,!=0.7,<1.0
 
 oslo.config>=1.9.0  # Apache-2.0
+oslo.context>=0.2.0                     # Apache-2.0
 oslo.utils>=1.2.0                       # Apache-2.0
 oslo.serialization>=1.2.0               # Apache-2.0
 oslo.i18n>=1.3.0  # Apache-2.0