diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-25 17:14:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-25 17:14:23 +0000 |
| commit | caad923f8906b5e9dcec2a2694ad2903e539907b (patch) | |
| tree | a2f530cfd22047f69c7337281ff5777913552877 /doc | |
| parent | 5ff47b8ccff837720d13f650189e20265593f11f (diff) | |
| parent | 69d5bc4e554542735da4a277473251ec6ac47e6c (diff) | |
| download | python-openstackclient-caad923f8906b5e9dcec2a2694ad2903e539907b.tar.gz | |
Merge "update heat object and command doc"
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/source/commands.rst | 12 | ||||
| -rw-r--r-- | doc/source/plugin-commands.rst | 4 | ||||
| -rw-r--r-- | doc/source/plugins.rst | 2 |
3 files changed, 16 insertions, 2 deletions
diff --git a/doc/source/commands.rst b/doc/source/commands.rst index 3598c284..2195720f 100644 --- a/doc/source/commands.rst +++ b/doc/source/commands.rst @@ -148,6 +148,8 @@ list check out :doc:`plugin-commands`. * ``dataprocessing plugin``: (**Data Processing (Sahara)**) * ``message-broker cluster``: (**Message Broker (Cue)**) * ``message flavor``: (**Messaging (Zaqar)**) +* ``orchestration resource``: (**Orchestration (Heat)**) +* ``orchestration template``: (**Orchestration (Heat)**) * ``pool``: (**Messaging (Zaqar)**) * ``ptr record``: (**DNS (Designate)**) * ``queue``: (**Messaging (Zaqar)**) @@ -155,7 +157,14 @@ list check out :doc:`plugin-commands`. * ``secret``: (**Key Manager (Barbican)**) * ``secret container``: (**Key Manager (Barbican)**) * ``secret order``: (**Key Manager (Barbican)**) -* ``stack``: (**Orchestration (Heat)**) +* ``software config``: (**Orchestration (Heat)**) +* ``software deployment``: (**Orchestration (Heat)**) +* ``stack event``: (**Orchestration (Heat)**) +* ``stack hook``: (**Orchestration (Heat)**) +* ``stack output``: (**Orchestration (Heat)**) +* ``stack resource``: (**Orchestration (Heat)**) +* ``stack snapshot``: (**Orchestration (Heat)**) +* ``stack template``: (**Orchestration (Heat)**) * ``task exeuction``: (**Workflow Engine (Mistral)**) * ``tld``: (**DNS (Designate)**) * ``workbook``: (**Workflow Engine (Mistral)**) @@ -190,6 +199,7 @@ Those actions with an opposite action are noted in parens if applicable. * ``remove`` (``add``) - remove an object from a group of objects * ``rescue`` (``unrescue``) - reboot a server in a special rescue mode allowing access to the original disks * ``resize`` - change a server's flavor +* ``restore`` - restore a heat stack snapshot * ``resume`` (``suspend``) - return one or more suspended servers to running state * ``revoke`` (``issue``) - revoke a token * ``save`` - download an object locally diff --git a/doc/source/plugin-commands.rst b/doc/source/plugin-commands.rst index 893c4c49..a3f41521 100644 --- a/doc/source/plugin-commands.rst +++ b/doc/source/plugin-commands.rst @@ -2,6 +2,8 @@ Plugin Commands ================= +Note: To see the complete syntax for the plugin commands, see the `CLI_Ref`_ + .. list-plugins:: openstack.cli.extension .. list-plugins:: openstack.key_manager.v1 @@ -30,3 +32,5 @@ .. list-plugins:: openstack.orchestration.v1 :detailed: + +.. _CLI_Ref: http://docs.openstack.org/cli-reference/openstack.html
\ No newline at end of file diff --git a/doc/source/plugins.rst b/doc/source/plugins.rst index 0c838ec5..32a40599 100644 --- a/doc/source/plugins.rst +++ b/doc/source/plugins.rst @@ -30,7 +30,7 @@ python-ceilometerclient using argparse python-congressclient using OpenStackClient python-cueclient using OpenStackClient python-designateclient using OpenStackClient -python-heatclient patch in progress (https://review.openstack.org/#/c/195867/) +python-heatclient using OpenStackClient python-ironicclient Using OpenStackClient python-magnumclient using argparse python-manilaclient using argparse |