openstack
/
tempest
Code Issues Proposed changes

Merge "Fixing ignored value of --config parameter in tempest account-generator"

This commit is contained in:
Zuul 2019-02-05 04:49:53 +00:00 committed by Gerrit Code Review
parent 225190e3a0 3e99c04329
commit 139b453d00
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tempest/cmd/account_generator.py
View File

@ -291,13 +291,16 @@ class TempestAccountGenerator(command.Command):
def main(opts=None):
setup_logging()
log_warning = False
if not opts:
LOG.warning("Use of: 'tempest-account-generator' is deprecated, "
"please use: 'tempest account-generator'")
log_warning = True
opts = get_options()
if opts.config_file:
config.CONF.set_config_path(opts.config_file)
setup_logging()
if log_warning:
LOG.warning("Use of: 'tempest-account-generator' is deprecated, "
"please use: 'tempest account-generator'")
if opts.os_tenant_name:
LOG.warning("'os-tenant-name' and 'OS_TENANT_NAME' are both "
"deprecated, please use 'os-project-name' or "