summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-08 18:15:49 +0000
committerGerrit Code Review <review@openstack.org>2015-12-08 18:15:49 +0000
commit9bff399ff34d3b1d2b7561747c8dbe8325955b25 (patch)
tree313ebe8e443018bb55465f8cb86cd5da0e53db46
parent56150de2243c8b9d81aa2dc87ffc764b893a75e1 (diff)
parentaca279a98325fc6ba74df7f5b78c8d07ef349a5b (diff)
downloadpython-openstackclient-9bff399ff34d3b1d2b7561747c8dbe8325955b25.tar.gz
Merge "Integrating mistralclient with openstackclient"
-rw-r--r--doc/source/commands.rst7
-rw-r--r--doc/source/plugins.rst2
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/source/commands.rst b/doc/source/commands.rst
index 60698950..1c6c2d8a 100644
--- a/doc/source/commands.rst
+++ b/doc/source/commands.rst
@@ -129,11 +129,14 @@ The following are known `Objects` used by OpenStack :doc:`plugins`. These are
listed here to avoid name conflicts when creating new plugins. For a complete
list check out :doc:`plugin-commands`.
+* ``action definition``: (**Workflow Engine (Mistral)**)
+* ``action execution``: (**Workflow Engine (Mistral)**)
* ``baremetal``: (**Baremetal (Ironic)**)
* ``congress datasource``: (**Policy (Congress)**)
* ``congress driver``: (**Policy (Congress)**)
* ``congress policy``: (**Policy (Congress)**)
* ``congress policy rule``: (**Policy (Congress)**)
+* ``cron trigger``: (**Workflow Engine (Mistral)**)
* ``dataprocessing data source``: (**Data Processing (Sahara)**)
* ``dataprocessing image``: (**Data Processing (Sahara)**)
* ``dataprocessing image tags``: (**Data Processing (Sahara)**)
@@ -150,7 +153,11 @@ list check out :doc:`plugin-commands`.
* ``secret container``: (**Key Manager (Barbican)**)
* ``secret order``: (**Key Manager (Barbican)**)
* ``stack``: (**Orchestration (Heat)**)
+* ``task exeuction``: (**Workflow Engine (Mistral)**)
* ``tld``: (**DNS (Designate)**)
+* ``workbook``: (**Workflow Engine (Mistral)**)
+* ``workflow``: (**Workflow Engine (Mistral)**)
+* ``workflow execution``: (**Workflow Engine (Mistral)**)
* ``zone``: (**DNS (Designate)**)
* ``zone blacklist``: (**DNS (Designate)**)
* ``zone transfer``: (**DNS (Designate)**)
diff --git a/doc/source/plugins.rst b/doc/source/plugins.rst
index 5f82cc68..193545e1 100644
--- a/doc/source/plugins.rst
+++ b/doc/source/plugins.rst
@@ -33,7 +33,7 @@ python-heatclient patch in progress (https://review.openstack.org/#
python-ironicclient Using OpenStackClient
python-magnumclient using argparse
python-manilaclient using argparse
-python-mistralclient using cliff
+python-mistralclient using OpenStackClient
python-muranoclient using argparse
python-saharaclient using OpenStackClient
python-troveclient using argparse