openstack/tempest
Code Issues Proposed changes

Merge "Make missing global config dir not fatal in tempest init"

Browse Source
This commit is contained in:
Jenkins 2016-06-08 23:13:00 +00:00 committed by Gerrit Code Review
commit fb052827b6
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tempest/cmd/init.py
View File

@ -114,15 +114,22 @@ class TempestInit(command.Command):
config_parse.write(conf_file)
def copy_config(self, etc_dir, config_dir):
shutil.copytree(config_dir, etc_dir)
if os.path.isdir(config_dir):
shutil.copytree(config_dir, etc_dir)
else:
LOG.warning("Global config dir %s can't be found" % config_dir)
def generate_sample_config(self, local_dir, config_dir):
conf_generator = os.path.join(config_dir,
'config-generator.tempest.conf')
if os.path.isdir(config_dir):
conf_generator = os.path.join(config_dir,
'config-generator.tempest.conf')
subprocess.call(['oslo-config-generator', '--config-file',
conf_generator],
cwd=local_dir)
subprocess.call(['oslo-config-generator', '--config-file',
conf_generator],
cwd=local_dir)
else:
LOG.warning("Skipping sample config generation because global "
"config dir %s can't be found" % config_dir)
def create_working_dir(self, local_dir, config_dir):
# Create local dir if missing