Merge "Use autoprogram-cliff for remaining plugin docs"

8 files changed, 17 insertions, 44 deletions

diff --git a/doc/requirements.txt b/doc/requirements.txt
index d603c1d4..ec692e75 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -21,12 +21,12 @@ python-karborclient>=0.6.0 # Apache-2.0
 python-mistralclient!=3.2.0,>=3.1.0 # Apache-2.0
 python-muranoclient>=0.8.2 # Apache-2.0
 python-neutronclient>=6.7.0 # Apache-2.0
-python-octaviaclient>=1.3.0 # Apache-2.0
-python-rsdclient>=0.1.0 # Apache-2.0
+python-octaviaclient>=1.11.0 # Apache-2.0
+python-rsdclient>=1.0.1 # Apache-2.0
 python-saharaclient>=1.4.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-watcherclient>=2.4.0 # Apache-2.0
+python-troveclient>=3.1.0 # Apache-2.0
+python-watcherclient>=2.5.0 # Apache-2.0
 python-zaqarclient>=1.0.0 # Apache-2.0
-python-zunclient>=3.4.0 # Apache-2.0
+python-zunclient>=3.6.0 # Apache-2.0
diff --git a/doc/source/cli/plugin-commands/octavia.rst b/doc/source/cli/plugin-commands/octavia.rst
index ce6259dd..640af1ac 100644
--- a/doc/source/cli/plugin-commands/octavia.rst
+++ b/doc/source/cli/plugin-commands/octavia.rst
@@ -1,10 +1,4 @@
 octavia
 -------
 
-.. TODO(efried): cut over to autoprogram-cliff once doc build is fixed
-
-For more details, see the :python-octaviaclient-doc:`python-octaviaclient
-plugin documentation </cli/index>`.
-
-.. list-plugins:: openstack.load_balancer.v2
-   :detailed:
+.. autoprogram-cliff:: openstack.load_balancer.v2
diff --git a/doc/source/cli/plugin-commands/rsd.rst b/doc/source/cli/plugin-commands/rsd.rst
index 9436c5ae..d28cea31 100644
--- a/doc/source/cli/plugin-commands/rsd.rst
+++ b/doc/source/cli/plugin-commands/rsd.rst
@@ -1,7 +1,4 @@
 rsd
 ---
 
-.. TODO(efried): Cut over to autoprogram-cliff once rsd plugin docs build
-
-.. list-plugins:: openstack.rsd.v1
-   :detailed:
+.. autoprogram-cliff:: openstack.rsd.v2
diff --git a/doc/source/cli/plugin-commands/trove.rst b/doc/source/cli/plugin-commands/trove.rst
index 75da2272..43560d4e 100644
--- a/doc/source/cli/plugin-commands/trove.rst
+++ b/doc/source/cli/plugin-commands/trove.rst
@@ -1,7 +1,4 @@
 trove
 -----
 
-.. TODO(efried): cut over to autoprogram-cliff once doc build is fixed
-
-.. list-plugins:: openstack.database.v1
-   :detailed:
+.. autoprogram-cliff:: openstack.database.v1
diff --git a/doc/source/cli/plugin-commands/watcher.rst b/doc/source/cli/plugin-commands/watcher.rst
index c888d3a1..9cf6dfee 100644
--- a/doc/source/cli/plugin-commands/watcher.rst
+++ b/doc/source/cli/plugin-commands/watcher.rst
@@ -1,10 +1,4 @@
 watcher
 -------
 
-.. TODO(efried): cut over to autoprogram-cliff once doc build is fixed
-
-For more details, see the :python-watcherclient-doc:`python-watcherclient
-plugin documentation </cli/openstack_cli>`.
-
-.. list-plugins:: openstack.infra_optim.v1
-   :detailed:
+.. autoprogram-cliff:: openstack.infra_optim.v1
diff --git a/doc/source/cli/plugin-commands/zun.rst b/doc/source/cli/plugin-commands/zun.rst
index 69f4f62c..17baac55 100644
--- a/doc/source/cli/plugin-commands/zun.rst
+++ b/doc/source/cli/plugin-commands/zun.rst
@@ -1,10 +1,4 @@
 zun
 ---
 
-.. TODO(efried): cut over to autoprogram-cliff once doc build is fixed
-
-For more details, see the :python-zunclient-doc:`python-zunclient plugin
-documentation </cli/command-list>`.
-
-.. list-plugins:: openstack.container.v1
-   :detailed:
+.. autoprogram-cliff:: openstack.container.v1
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 92febda4..d3dfccd2 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -34,11 +34,8 @@ extensions = ['sphinx.ext.autodoc',
 repository_name = 'openstack/python-openstackclient'
 use_storyboard = True
 
-openstack_projects = [
-    'python-octaviaclient',
-    'python-watcherclient',
-    'python-zunclient',
-]
+# Add project 'foo' to this list to enable the :foo-doc: role
+# openstack_projects = []
 
 # Add any paths that contain templates here, relative to this directory.
 #templates_path = ['_templates']
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 6533edaf..201726ac 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -101,17 +101,17 @@ python-mistralclient==3.1.0
 python-muranoclient==0.8.2
 python-neutronclient==6.7.0
 python-novaclient==15.0.0
-python-octaviaclient==1.3.0
-python-rsdclient==0.1.0
+python-octaviaclient==1.11.0
+python-rsdclient==1.0.1
 python-saharaclient==1.4.0
 python-searchlightclient==1.0.0
 python-senlinclient==1.1.0
 python-subunit==1.0.0
 python-swiftclient==3.2.0
-python-troveclient==2.2.0
-python-watcherclient==2.4.0
+python-troveclient==3.1.0
+python-watcherclient==2.5.0
 python-zaqarclient==1.0.0
-python-zunclient==3.4.0
+python-zunclient==3.6.0
 pytz==2013.6
 PyYAML==3.12
 repoze.lru==0.7