]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Use worker httpd instead of prefork (like ubuntu) on rpm distros.
authorSandon Van Ness <sandon@inktank.com>
Fri, 25 Oct 2013 20:14:21 +0000 (13:14 -0700)
committerSandon Van Ness <sandon@inktank.com>
Fri, 25 Oct 2013 20:23:10 +0000 (13:23 -0700)
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>
teuthology/task/rgw.py

index fded6aa3d56bc9ab48113abd52b38537d218762f..50ec0300c6944b21dd75e0f4114011f75071babc 100644 (file)
@@ -221,7 +221,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=[
                 'adjust-ulimits',