From: Sage Weil <sage@newdream.net>
Date: Wed, 5 Oct 2011 22:54:57 +0000 (-0700)
Subject: rgw: keep radosgw in foreground
X-Git-Tag: 1.1.0~2767
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4e61e4835e6e6ff44e865d2fe771a20617497ecb;p=teuthology.git

rgw: keep radosgw in foreground

It defaults to a daemon now.
---

diff --git a/teuthology/task/rgw.py b/teuthology/task/rgw.py
index 0e411e06a..909bc0dd8 100644
--- a/teuthology/task/rgw.py
+++ b/teuthology/task/rgw.py
@@ -63,7 +63,7 @@ def ship_config(ctx, config):
             data="""#!/bin/sh
 ulimit -c unlimited
 export LD_LIBRARY_PATH=/tmp/cephtest/binary/usr/local/lib
-exec /tmp/cephtest/binary/usr/local/bin/radosgw -c /tmp/cephtest/ceph.conf
+exec /tmp/cephtest/binary/usr/local/bin/radosgw -f -c /tmp/cephtest/ceph.conf
 """
             )
         remote.run(
@@ -109,6 +109,7 @@ def start_rgw(ctx, config):
                 '-c', '/tmp/cephtest/ceph.conf',
                 '--log-file', '/tmp/cephtest/archive/log/rgw.log',
                 '/tmp/cephtest/apache/apache.conf',
+                '--foreground',
                 run.Raw('>'),
                 '/tmp/cephtest/archive/log/rgw.stdout',
                 run.Raw('2>&1'),