Merge "Add plugin adoption for trove"

doc/source/commands.rst

@@ -181,6 +181,7 @@ list check out :doc:`plugin-commands`.
 * ``congress policy``: (**Policy (Congress)**)
 * ``congress policy rule``: (**Policy (Congress)**)
 * ``cron trigger``: (**Workflow Engine (Mistral)**)
+* ``database flavor``: (**Database (Trove)**)
 * ``dataprocessing data source``: (**Data Processing (Sahara)**)
 * ``dataprocessing image``: (**Data Processing (Sahara)**)
 * ``dataprocessing image tags``: (**Data Processing (Sahara)**)

doc/source/plugin-commands.rst

@@ -97,6 +97,12 @@ senlin
 .. # list-plugins:: openstack.tripleoclient.v1
 .. #   :detailed:
 
+trove
+------
+
+.. list-plugins:: openstack.database.v1
+   :detailed:
+
 .. watcher
 .. # watcherclient is not in global-requirements
 .. # list-plugins:: openstack.infra_optim.v1

doc/source/plugins.rst

@@ -36,6 +36,7 @@ The following is a list of projects that are an OpenStackClient plugin.
 - python-searchlightclient
 - python-senlinclient
 - python-tripleoclient\*\*
+- python-troveclient
 - python-watcherclient
 - python-zaqarclient
 
@@ -45,7 +46,6 @@ The following is a list of projects that are an OpenStackClient plugin.
 
 The following is a list of projects that are not an OpenStackClient plugin.
 
-- python-troveclient
 - python-magnumclient
 - python-ceilometerclient
 - python-solumclient

test-requirements.txt

@@ -36,4 +36,5 @@ python-neutronclient>=5.1.0 # Apache-2.0
 python-saharaclient>=0.18.0 # Apache-2.0
 python-searchlightclient>=1.0.0 #Apache-2.0
 python-senlinclient>=1.1.0 # Apache-2.0
+python-troveclient>=2.2.0 # Apache-2.0
 python-zaqarclient>=1.0.0 # Apache-2.0