openinfra
/
python-tempestconf
Code Issues Proposed changes

Merge "Remove default-overrides.conf"

This commit is contained in:
Zuul 2018-07-04 14:50:07 +00:00 committed by Gerrit Code Review
parent a175eb99b4 03ab541473
commit 3946b69c75
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config_tempest/main.py
View File

@ -175,7 +175,7 @@ def set_options(conf, deployer_input, non_admin, overrides=[],
if non_admin: if non_admin:
# non admin, so delete auth admin values which were set # non admin, so delete auth admin values which were set
# from default-overides.conf file # in load_basic_defaults method
conf.set("auth", "admin_username", "") conf.set("auth", "admin_username", "")
conf.set("auth", "admin_project_name", "") conf.set("auth", "admin_project_name", "")
conf.set("auth", "admin_password", "") conf.set("auth", "admin_password", "")

3
etc/default-overrides.conf
View File

@ -1,3 +0,0 @@
# The content of the file was moved to the source
# code of python-tempestconf.
# The file will removed soon.

3
setup.cfg
View File

@ -23,9 +23,6 @@ classifier =
packages = packages =
config_tempest config_tempest
data_files =
etc/tempest = etc/*
[entry_points] [entry_points]
console_scripts = console_scripts =
discover-tempest-config = config_tempest.main:main discover-tempest-config = config_tempest.main:main