From: Sandon Van Ness <sandon@inktank.com>
Date: Fri, 25 Oct 2013 20:14:21 +0000 (-0700)
Subject: Use worker httpd instead of prefork (like ubuntu) on rpm distros.
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9c2cf0f0855a8a802568bc635a959d60a6816a8f;p=teuthology.git

Use worker httpd instead of prefork (like ubuntu) on rpm distros.

Ubuntu's default apache uses worker instead of prefork like rpm
based distro's. If rpm use httpd.worker instead of httpd so that
the -X behavior will not be blocked by a single request.

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
---

diff --git a/teuthology/task/rgw.py b/teuthology/task/rgw.py
index 47d589d61e..42f4689ce3 100644
--- a/teuthology/task/rgw.py
+++ b/teuthology/task/rgw.py
@@ -220,7 +220,7 @@ def start_apache(ctx, config):
         if system_type == 'deb':
             apache_name = 'apache2'
         else:
-            apache_name = '/usr/sbin/httpd'
+            apache_name = '/usr/sbin/httpd.worker'
         proc = remote.run(
             args=[
                 '{tdir}/adjust-ulimits'.format(tdir=testdir),