apache: switch to use the apache worker mpm

Fixes: #9169
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit c3b53c326558dd3dd435c9e3fdbc07d8c15f4e68)

diff --git a/tasks/rgw.py b/tasks/rgw.py
index bcd643a06bb3c7f6d43e168395d869b3975a280f..8480380fbd66361919b85f4f3236a1ce0dbdbd38 100644 (file)
--- a/tasks/rgw.py
+++ b/tasks/rgw.py
@@ -12,6 +12,7 @@ from cStringIO import StringIO
 from teuthology.orchestra import run
 from teuthology import misc as teuthology
 from teuthology import contextutil
+from teuthology.orchestra.run import CommandFailedError
 from util.rgw import rgwadmin
 from util.rados import (rados, create_ec_pool,
                                         create_replicated_pool,
@@ -271,7 +272,17 @@ def start_apache(ctx, config):
         if system_type == 'deb':
             apache_name = 'apache2'
         else:
-            apache_name = '/usr/sbin/httpd'
+            try:
+                remote.run(
+                    args=[
+                        'stat',
+                        '/usr/sbin/httpd.worker',
+                    ],
+                )
+                apache_name = '/usr/sbin/httpd.worker'
+            except CommandFailedError:
+                apache_name = '/usr/sbin/httpd'
+
         proc = remote.run(
             args=[
                 'adjust-ulimits',