commit 5b60c2765d8322de24bcb8de7f5bfe350cbaee7b
author Jenkins <jenkins@review.openstack.org> Mon Sep 12 19:30:17 2016 +0000
committer Gerrit Code Review <review@openstack.org> Mon Sep 12 19:30:17 2016 +0000
tree 7203c4ea64c0ac1d106fef2d85bdfd6121cf3f40
parent d6f4b0d1442d6ceadcdf2e26174764892b9b8dfe
parent e8a703b56458298aec8ac18cbb1e7e9a8233e0b5

Merge "Add description to the help of enable_instance_password"

tempest/config.py

diff --git a/tempest/config.py b/tempest/config.py
index 3fd20ab..1d89eb0 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -370,7 +370,8 @@
                 default=True,
                 help='Enables returning of the instance password by the '
                      'relevant server API calls such as create, rebuild '
-                     'or rescue.'),
+                     'or rescue. This configuration value should be same as '
+                     'nova.conf: DEFAULT.enable_instance_password'),
     cfg.BoolOpt('interface_attach',
                 default=True,
                 help='Does the test environment support dynamic network '