--- a/components/python/oslo.messaging/Makefile	Wed Sep 07 14:48:32 2016 -0700
+++ b/components/python/oslo.messaging/Makefile	Wed Sep 07 14:48:32 2016 -0700
@@ -26,16 +26,16 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		oslo.messaging
-COMPONENT_VERSION=	1.8.3
+COMPONENT_VERSION=	4.6.1
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:149d325431e2c4415edd5bdaec0cff4e9109c02e8f428382610cfa1a238692ea
+    sha256:be0499c3c2bf22f7ab3934bd2c331af6eea47f8c6508774d209a8028e9582421
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
-COMPONENT_PROJECT_URL=	https://launchpad.net/oslo.messaging
+COMPONENT_PROJECT_URL=	http://docs.openstack.org/developer/oslo.messaging/
 COMPONENT_BUGDB=	python-mod/oslo.messaging
 
-TPNO=			25742
+TPNO=			27980
 
 # Depends on oslo.utils which is not Python 3 ready.
 PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
@@ -51,11 +51,8 @@
 
 install:	$(INSTALL_NO_ARCH)
 
-# see $(COMPONENT_SRC)/test-requirements.txt for the python modules
+# See $(COMPONENT_SRC)/test-requirements.txt for the Python modules
 # required to execute unittests.
 test:		$(NO_TESTS)
 
-system-test:    $(NO_TESTS)
-
-REQUIRED_PACKAGES += library/python/eventlet-27
-REQUIRED_PACKAGES += library/python/oslo.config-27
+system-test:	$(NO_TESTS)

--- a/components/python/oslo.messaging/oslo.messaging-PYVER.p5m	Wed Sep 07 14:48:32 2016 -0700
+++ b/components/python/oslo.messaging/oslo.messaging-PYVER.p5m	Wed Sep 07 14:48:32 2016 -0700
@@ -38,71 +38,83 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2014/302
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo.messaging-$(COMPONENT_VERSION)-py$(PYVER)-nspkg.pth
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo.messaging-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo.messaging-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo.messaging-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo.messaging-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo.messaging-$(COMPONENT_VERSION)-py$(PYVER).egg-info/namespace_packages.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo.messaging-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo.messaging-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo.messaging-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo.messaging-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_drivers/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_drivers/common.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_executors/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/_executors/base.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/conffixture.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/exceptions.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/localcontext.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/notify/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/notify/dispatcher.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/notify/listener.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/notify/log_handler.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/notify/logger.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/notify/middleware.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/notify/notifier.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/rpc/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/rpc/client.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/rpc/dispatcher.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/rpc/server.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/serializer.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/server.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/target.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo/messaging/transport.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_cmd/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_cmd/zmq_receiver.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_cmd/zmq_broker.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/amqp.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/amqpdriver.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/base.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/common.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/impl_fake.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/impl_qpid.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/impl_kafka.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/impl_pika.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/impl_rabbit.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/impl_zmq.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/matchmaker.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/matchmaker_redis.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/matchmaker_ring.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/pika_driver/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/pika_driver/pika_engine.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/pika_driver/pika_exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/pika_driver/pika_listener.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/pika_driver/pika_message.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/pika_driver/pika_poller.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/pool.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/protocols/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/protocols/amqp/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/protocols/amqp/controller.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/protocols/amqp/driver.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/protocols/amqp/drivertasks.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/protocols/amqp/eventloop.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/protocols/amqp/opts.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_executors/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_executors/base.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_executors/impl_aioeventlet.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_executors/impl_blocking.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_executors/impl_eventlet.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_executors/impl_thread.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/broker/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/broker/zmq_base_proxy.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/broker/zmq_broker.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/broker/zmq_queue_proxy.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/client/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/client/publishers/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/client/publishers/dealer/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/client/publishers/dealer/zmq_dealer_call_publisher.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/client/publishers/dealer/zmq_dealer_publisher.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/client/publishers/zmq_pub_publisher.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/client/publishers/zmq_publisher_base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/client/publishers/zmq_push_publisher.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/client/zmq_client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/client/zmq_client_base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/client/zmq_request.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/matchmaker/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/matchmaker/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/matchmaker/matchmaker_redis.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/poller/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/poller/green_poller.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/poller/threading_poller.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/server/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/server/consumers/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/server/consumers/zmq_consumer_base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/server/consumers/zmq_pull_consumer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/server/consumers/zmq_router_consumer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/server/consumers/zmq_sub_consumer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/server/zmq_incoming_message.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/server/zmq_server.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/zmq_address.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/zmq_async.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/zmq_names.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/zmq_poller.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_drivers/zmq_driver/zmq_socket.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_i18n.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/_utils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/conffixture.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/dispatcher.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/hacking/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/hacking/checks.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/localcontext.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/notify/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/notify/_impl_log.py
@@ -115,11 +127,9 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/notify/listener.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/notify/log_handler.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/notify/logger.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/notify/messaging.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/notify/middleware.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/notify/notifier.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/openstack/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/openstack/common/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/openstack/common/context.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/opts.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/rpc/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/oslo_messaging/rpc/client.py
@@ -136,36 +146,71 @@
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
     pkg.debug.depend.path=usr/bin
 
-# force a dependency on aioeventlet; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/aioeventlet-$(PYV)
+# force a dependency on cachetools; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/cachetools-$(PYV)
+
+# force a dependency on debtcollector; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/debtcollector-$(PYV)
+
+# force a dependency on eventlet; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/eventlet-$(PYV)
 
 # force a dependency on futures; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/futures-$(PYV)
 
-# force a dependency on greenlet; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/greenlet-$(PYV)
+# force a dependency on futurist; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/futurist-$(PYV)
 
 # force a dependency on kombu; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/kombu-$(PYV)
 
+# force a dependency on oslo.config; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.config-$(PYV)
+
+# force a dependency on oslo.context; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/oslo.context-$(PYV)
+
 # force a dependency on oslo.i18n; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/oslo.i18n-$(PYV)
 
+# force a dependency on oslo.log; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.log-$(PYV)
+
 # force a dependency on the oslo.messaging package
 depend type=require \
     fmri=library/python/oslo.messaging@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 
-# force a dependency on oslo.middleware; pkgdepend work is needed to flush this out.
+# force a dependency on oslo.middleware; pkgdepend work is needed to flush this
+# out.
 depend type=require fmri=library/python/oslo.middleware-$(PYV)
 
-# force a dependency on oslo.serialization; pkgdepend work is needed to flush this out.
+# force a dependency on oslo.serialization; pkgdepend work is needed to flush
+# this out.
 depend type=require fmri=library/python/oslo.serialization-$(PYV)
 
+# force a dependency on oslo.service; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/oslo.service-$(PYV)
+
 # force a dependency on oslo.utils; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/oslo.utils-$(PYV)
 
-# force a dependency on pbr; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/pbr-$(PYV)
+# force a dependency on pika; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pika-$(PYV)
+
+# force a dependency on pika-pool; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pika-pool-$(PYV)
+
+# force a dependency on pyyaml; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pyyaml-$(PYV)
+
+# force a dependency on retrying; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/retrying-$(PYV)
+
+# force a dependency on setuptools; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/setuptools-$(PYV)
 
 # force a dependency on six; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/six-$(PYV)
@@ -173,8 +218,5 @@
 # force a dependency on stevedore; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/stevedore-$(PYV)
 
-# force a dependency on trollius; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/trollius-$(PYV)
-
 # force a dependency on webob; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/webob-$(PYV)