diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-09-19 08:53:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-09-19 08:53:55 +0000 |
| commit | a060ba82176c3cd2426b13c7a8893b2ff41c9fc8 (patch) | |
| tree | 14d2cce421f1d7cada00fcad4a2530780d52427a | |
| parent | 39c00ab8b7a2c5ee8b82a26f779966806236dbc8 (diff) | |
| parent | e785570406cd3f942618cfac0511f07d89b496e1 (diff) | |
| download | python-openstackclient-a060ba82176c3cd2426b13c7a8893b2ff41c9fc8.tar.gz | |
Merge "Add python-zunclient plugin"
| -rw-r--r-- | doc/source/cli/commands.rst | 5 | ||||
| -rw-r--r-- | doc/source/cli/plugin-commands.rst | 6 | ||||
| -rw-r--r-- | doc/source/contributor/plugins.rst | 1 | ||||
| -rw-r--r-- | test-requirements.txt | 1 |
4 files changed, 13 insertions, 0 deletions
diff --git a/doc/source/cli/commands.rst b/doc/source/cli/commands.rst index 47163786..f70eabc3 100644 --- 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 index 34efdc3d..51c67db6 100644 --- 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 index 8bdfe484..e69dde8b 100644 --- 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 index 19f22bb4..4f349b8b 100644 --- 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 |