RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

qa/tasks/cephadm: refactor

Browse Source 
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
This commit is contained in:
Deepika Upadhyay 2020-11-17 14:15:30 +05:30
parent 2f0209ae43
commit 22b832e94e
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
qa/tasks/cephadm.py
View File

@ -172,15 +172,9 @@ def ceph_log(ctx, config):
cluster_name = config['cluster']
fsid = ctx.ceph[cluster_name].fsid
# Add logs directory to job's info log file
with open(os.path.join(ctx.archive, 'info.yaml'), 'r+') as info_file:
info_yaml = yaml.safe_load(info_file)
info_file.seek(0)
if 'archive' not in info_yaml:
info_yaml['archive'] = {'log': '/var/log/ceph'}
else:
info_yaml['archive']['log'] = '/var/log/ceph'
yaml.safe_dump(info_yaml, info_file, default_flow_style=False)
if ctx.archive is not None:
update_info_yaml(ctx.archive, 'log', '/var/log/ceph')
try:
yield
@ -290,15 +284,8 @@ def ceph_crash(ctx, config):
cluster_name = config['cluster']
fsid = ctx.ceph[cluster_name].fsid
# Add logs directory to job's info log file
with open(os.path.join(ctx.archive, 'info.yaml'), 'r+') as info_file:
info_yaml = yaml.safe_load(info_file)
info_file.seek(0)
if 'archive' not in info_yaml:
info_yaml['archive'] = {'crash': '/var/lib/ceph/%s/crash' % fsid}
else:
info_yaml['archive']['crash'] = '/var/lib/ceph/%s/crash' % fsid
yaml.safe_dump(info_yaml, info_file, default_flow_style=False)
if ctx.archive is not None:
update_info_yaml(ctx.archive, 'crash', '/var/lib/ceph/crash')
try:
yield