summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-06-24 08:37:47 +0000
committerGerrit Code Review <review@openstack.org>2014-06-24 08:37:47 +0000
commit792431c5bbe6275d100e6d73ef07218061da5b69 (patch)
treed26d93ac3ac05b8920eb6b4b682138c32ff849cc
parent344a38a661d2379cda5675566dc4e185a3d1050f (diff)
parent8a632221320b91759b7b6018ec6097d4cc404701 (diff)
downloadpython-troveclient-792431c5bbe6275d100e6d73ef07218061da5b69.tar.gz
Merge "Updates root-enable & root-show help messages"
-rw-r--r--README.rst4
-rw-r--r--troveclient/v1/shell.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/README.rst b/README.rst
index 1646f58..a535c13 100644
--- a/README.rst
+++ b/README.rst
@@ -120,8 +120,8 @@ You'll find complete documentation on the shell by running
resize-flavor Resizes the flavor of an instance.
resize-volume Resizes the volume size of an instance.
restart Restarts an instance.
- root-enable Enables root for an instance.
- root-show Shows 'root enabled' status of an instance.
+ root-enable Enables root for an instance and resets if already exists.
+ root-show Gets status if root was ever enabled for an instance.
secgroup-add-rule Creates a security group rule.
secgroup-delete-rule
Deletes a security group rule.
diff --git a/troveclient/v1/shell.py b/troveclient/v1/shell.py
index 3c25d10..899780f 100644
--- a/troveclient/v1/shell.py
+++ b/troveclient/v1/shell.py
@@ -570,7 +570,7 @@ def do_limit_list(cs, args):
@utils.arg('instance', metavar='<instance>', help='ID of the instance.')
@utils.service_type('database')
def do_root_enable(cs, args):
- """Enables root for an instance."""
+ """Enables root for an instance and resets if already exists."""
root = cs.root.create(args.instance)
utils.print_dict({'name': root[0], 'password': root[1]})
@@ -578,7 +578,7 @@ def do_root_enable(cs, args):
@utils.arg('instance', metavar='<instance>', help='ID of the instance.')
@utils.service_type('database')
def do_root_show(cs, args):
- """Shows 'root enabled' status of an instance."""
+ """Gets status if root was ever enabled for an instance."""
root = cs.root.is_root_enabled(args.instance)
utils.print_dict({'is_root_enabled': root.rootEnabled})