From: Sage Weil <sage@inktank.com>
Date: Tue, 22 Oct 2013 21:36:35 +0000 (-0700)
Subject: rgw: revert to -X for apache2
X-Git-Tag: 1.1.0~1793
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6a2dd66d6bbb0439c6d7665b74e6dd48d7bc8dc9;p=teuthology.git

rgw: revert to -X for apache2

-DNO_DETACH doesn't seem to work.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/teuthology/task/rgw.py b/teuthology/task/rgw.py
index afec130b7..fded6aa3d 100644
--- a/teuthology/task/rgw.py
+++ b/teuthology/task/rgw.py
@@ -228,8 +228,7 @@ def start_apache(ctx, config):
                 'daemon-helper',
                 'kill',
                 apache_name,
-    #            '-X',
-                '-DNO_DETACH',
+                '-X',
                 '-f',
                 '{tdir}/apache/apache.{client}.conf'.format(tdir=testdir,
                                                             client=client),