summaryrefslogtreecommitdiff
path: root/doc/source
diff options
context:
space:
mode:
authorRui Chen <chenrui.momo@gmail.com>2016-03-14 16:53:51 +0800
committerRui Chen <chenrui.momo@gmail.com>2016-04-05 21:22:27 +0800
commit4d3f996e7ce5385688f6e570b8ac73327bac9f44 (patch)
tree085b3b9268eccdf919d5cc95e306569194cfcc27 /doc/source
parent97492c168f395eb80009162eb2e242dde23e0ba5 (diff)
downloadpython-openstackclient-4d3f996e7ce5385688f6e570b8ac73327bac9f44.tar.gz
Log hint when --enable present with --disable-reason
--enable and --disable-reason should be mutually exclusive in "compute service set" command, but now when they are present at the same time, --disable-reason would be ignored silently. Fix these and add some hints about --disable-reason argument is ignored in this situation. Change-Id: I43254b6bc40fcae4fd0dc3457f26fad84c267072 Closes-Bug: #1556801
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/command-objects/compute-service.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/source/command-objects/compute-service.rst b/doc/source/command-objects/compute-service.rst
index db75bef4..bda64c81 100644
--- a/doc/source/command-objects/compute-service.rst
+++ b/doc/source/command-objects/compute-service.rst
@@ -36,7 +36,7 @@ List service command
.. _compute-service-list:
.. option:: --host <host>
- List services on specified host (name only)
+ List services on specified host (name only)
.. option:: --service <service>
@@ -71,7 +71,8 @@ Set service command
.. option:: --disable-reason <reason>
- Reason for disabling the service (in quotes)
+ Reason for disabling the service (in quotes). Note that when the service
+ is enabled, this option is ignored.
.. describe:: <host>