From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Tue, 7 Mar 2017 16:31:52 +0000 (+0100)
Subject: qa/tasks/rgw.py: start Apache before RadosGW.
X-Git-Tag: v12.0.1~148^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F13846%2Fhead;p=ceph.git

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

At the end of start_rgw() we wait till establishing HTTP connections
with RadosGW become possible. However, if RadosGW uses the FastCGI,
the condition can't be fulfilled without spawning HTTP server first.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
---

diff --git a/qa/tasks/rgw.py b/qa/tasks/rgw.py
index c8da3629c7d..254c5294c84 100644
--- a/qa/tasks/rgw.py
+++ b/qa/tasks/rgw.py
@@ -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([