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 47d589d61e1c3cc25fe173f7e1259f096ac23cd9..42f4689ce39d18c40e863631d514c3970c6b106d 100644 (file)
--- 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),