--- a/components/python/troveclient/Makefile	Wed Sep 07 14:48:38 2016 -0700
+++ b/components/python/troveclient/Makefile	Wed Sep 07 14:48:38 2016 -0700
@@ -26,16 +26,16 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		python-troveclient
-COMPONENT_VERSION=	1.0.9
+COMPONENT_VERSION=	2.1.1
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:ed9fad408c249a37e779a305cadb5cdecc656891eed27bc34b9d99f425a3fd69
+    sha256:065440a3baf785a961523baa311b3cd6806d2f32616af74aa57af2dcb0da492e
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
-COMPONENT_PROJECT_URL=	http://launchpad.net/python-troveclient
+COMPONENT_PROJECT_URL=	http://docs.openstack.org/developer/python-troveclient/
 COMPONENT_BUGDB=	service/trove
 
-TPNO=			25759
+TPNO=			29133
 
 # Depends on keystoneclient which is not Python 3 ready.
 PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
@@ -47,16 +47,15 @@
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 COMPONENT_POST_INSTALL_ACTION = \
-	(cd $(PROTO_DIR)/usr/bin ; $(MV) -f trove trove-$(PYTHON_VERSION))
+    (cd $(PROTO_DIR)/usr/bin ; $(MV) -f trove trove-$(PYTHON_VERSION))
 
 # common targets
 build:		$(BUILD_NO_ARCH)
 
 install:	$(INSTALL_NO_ARCH)
 
-# tests require:
-# hacking, discover, sphinx, testrepository and testtools,
-# some of which have not been integrated.
+# See $(COMPONENT_SRC)/test-requirements.txt for the Python modules
+# required to execute unittests.
 test:		$(NO_TESTS)
 
-system-test:    $(NO_TESTS)
+system-test:	$(NO_TESTS)

--- a/components/python/troveclient/troveclient-PYVER.p5m	Wed Sep 07 14:48:38 2016 -0700
+++ b/components/python/troveclient/troveclient-PYVER.p5m	Wed Sep 07 14:48:38 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -100,6 +100,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/limits.py
 file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/management.py
 file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/metadata.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/modules.py
 file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/quota.py
 file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/root.py
 file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/security_groups.py
@@ -113,9 +114,6 @@
 # out.
 depend type=group fmri=library/python/eventlet-$(PYV)
 
-# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/argparse-$(PYV)
-
 # force a dependency on babel; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/babel-$(PYV)
 
@@ -126,6 +124,9 @@
 # out.
 depend type=require fmri=library/python/keystoneclient-$(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.utils; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/oslo.utils-$(PYV)
 
@@ -150,6 +151,9 @@
 # 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 swiftclient; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/swiftclient-$(PYV)
+
 # force a dependency on the troveclient package
 depend type=require \
     fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)