From ab1f637f55275a92033838a98bd7ddbcb37beb5d Mon Sep 17 00:00:00 2001
From: Trevor McCasland <TM2086@att.com>
Date: Tue, 17 Jan 2017 09:50:40 -0600
Subject: [PATCH] Add plugin adoption for trove

With I308a6c6f3f5ce7dbb814ec0fd8ecb1734a2f137f merged in the
python-troveclient project, trove can now say it has adopted the
plugin.

What commands that actually get implemented for this cycle, is to be
determined. Another patch adding more commands to the docs will be
proposed later when they get merged.

Change-Id: If2c2545dd5d1510cc6eece698e34ad0f8c1b970f
---
 doc/source/commands.rst        | 1 +
 doc/source/plugin-commands.rst | 6 ++++++
 doc/source/plugins.rst         | 2 +-
 test-requirements.txt          | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/doc/source/commands.rst b/doc/source/commands.rst
index 78668a0f22..1f1ece4fba 100644
--- a/doc/source/commands.rst
+++ b/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)**)
diff --git a/doc/source/plugin-commands.rst b/doc/source/plugin-commands.rst
index 7428b34d01..844c48a72a 100644
--- a/doc/source/plugin-commands.rst
+++ b/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
diff --git a/doc/source/plugins.rst b/doc/source/plugins.rst
index 0965c12f74..eafe5e8fa0 100644
--- a/doc/source/plugins.rst
+++ b/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
diff --git a/test-requirements.txt b/test-requirements.txt
index b53d08dd71..62e41b83c2 100644
--- a/test-requirements.txt
+++ b/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