Merge "Add python-zunclient plugin"

Jenkins · openstack-gerrit · commit a060ba82176c · 2017-09-19T08:53:55.000Z
diff --git a/doc/source/cli/commands.rst b/doc/source/cli/commands.rst
@@ -173,6 +173,11 @@ conflicts when creating new plugins. For a complete list check out
 * ``acl user``: (**Key Manager (Barbican)**)
 * ``action definition``: (**Workflow Engine (Mistral)**)
 * ``action execution``: (**Workflow Engine (Mistral)**)
+* ``appcontainer``: (**Application Container (Zun)**)
+* ``appcontainer host``: (**Application Container (Zun)**)
+* ``appcontainer image``: (**Application Container (Zun)**)
+* ``appcontainer network``: (**Application Container (Zun)**)
+* ``appcontainer service``: (**Application Container (Zun)**)
 * ``baremetal``: (**Baremetal (Ironic)**)
 * ``claim``: (**Messaging (Zaqar)**)
 * ``cluster``: (**Clustering (Senlin)**)
diff --git a/doc/source/cli/plugin-commands.rst b/doc/source/cli/plugin-commands.rst
@@ -126,3 +126,9 @@ zaqar
 
 .. list-plugins:: openstack.messaging.v2
    :detailed:
+
+zun
+---
+
+.. list-plugins:: openstack.container.v1
+   :detailed:
diff --git a/doc/source/contributor/plugins.rst b/doc/source/contributor/plugins.rst
@@ -43,6 +43,7 @@ The following is a list of projects that are an OpenStackClient plugin.
 - python-troveclient
 - python-watcherclient
 - python-zaqarclient
+- python-zunclient
 
 \*\* Note that some clients are not listed in global-requirements.
 
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -42,3 +42,4 @@ 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
+python-zunclient>=0.2.0  # Apache-2.0
