RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 17:05:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13846 from rzarzynski/wip-qa-rgw-start-apache-first

Browse Source 
qa/tasks/rgw.py: start Apache before RadosGW.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
This commit is contained in:
Yehuda Sadeh 2017-03-07 15:13:35 -08:00 committed by GitHub
commit 1bb5ea860f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qa/tasks/rgw.py
View File

@ -1305,8 +1305,8 @@ def task(ctx, config):
subtasks.extend([
lambda: ship_apache_configs(ctx=ctx, config=config,
role_endpoints=role_endpoints, on_client=master_client),
lambda: start_rgw(ctx=ctx, config=config, on_client=master_client),
lambda: start_apache(ctx=ctx, config=config, on_client=master_client),
lambda: start_rgw(ctx=ctx, config=config, on_client=master_client),
])
elif ctx.rgw.frontend == 'civetweb':
subtasks.extend([
@ -1345,15 +1345,15 @@ def task(ctx, config):
on_client=None,
except_client = master_client,
),
lambda: start_rgw(ctx=ctx,
config=config,
on_client=None,
except_client = master_client),
lambda: start_apache(ctx=ctx,
config = config,
on_client=None,
except_client = master_client,
),
lambda: start_rgw(ctx=ctx,
config=config,
on_client=None,
except_client = master_client),
])
elif ctx.rgw.frontend == 'civetweb':
subtasks.extend([
@ -1386,9 +1386,9 @@ def task(ctx, config):
subtasks.extend([
lambda: ship_apache_configs(ctx=ctx, config=config,
role_endpoints=role_endpoints),
lambda: start_apache(ctx=ctx, config=config),
lambda: start_rgw(ctx=ctx,
config=config),
lambda: start_apache(ctx=ctx, config=config),
])
elif ctx.rgw.frontend == 'civetweb':
subtasks.extend([