]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: revert to -X for apache2
authorSage Weil <sage@inktank.com>
Tue, 22 Oct 2013 21:36:35 +0000 (14:36 -0700)
committerSage Weil <sage@inktank.com>
Tue, 22 Oct 2013 21:36:35 +0000 (14:36 -0700)
-DNO_DETACH doesn't seem to work.

Signed-off-by: Sage Weil <sage@inktank.com>
teuthology/task/rgw.py

index afec130b7703860a6c34db1f1935420347a8b0fc..fded6aa3d56bc9ab48113abd52b38537d218762f 100644 (file)
@@ -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),