From 96b82796cac21927669a8baa6085b6a6fbfcd374 Mon Sep 17 00:00:00 2001 From: Yan Jun Date: Mon, 9 Oct 2017 11:41:12 +0800 Subject: [PATCH] vstart.sh: move rgw configuration to client.rgw section Signed-off-by: Yan Jun --- src/vstart.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/vstart.sh b/src/vstart.sh index 1fd78eec9e133..85dd85d4c3cce 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -435,11 +435,6 @@ prepare_conf() { erasure code dir = $EC_PATH plugin dir = $CEPH_LIB osd pool default erasure code profile = plugin=jerasure technique=reed_sol_van k=2 m=1 crush-failure-domain=osd - rgw frontends = $rgw_frontend port=$CEPH_RGW_PORT - ; needed for s3tests - rgw crypt s3 kms encryption keys = testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo= - rgw crypt require ssl = false - rgw lc debug interval = 10 filestore fd cache size = 32 run dir = $CEPH_OUT_DIR enable experimental unrecoverable data corrupting features = * @@ -474,6 +469,11 @@ EOF admin socket = $CEPH_ASOK_DIR/\$name.\$pid.asok $extra_conf [client.rgw] + rgw frontends = $rgw_frontend port=$CEPH_RGW_PORT + ; needed for s3tests + rgw crypt s3 kms encryption keys = testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo= + rgw crypt require ssl = false + rgw lc debug interval = 10 [mds] $DAEMONOPTS @@ -782,8 +782,7 @@ else debug bluefs = 20 debug rocksdb = 10 debug bdev = 20 - debug rgw = 20 - debug reserver = 10 + debug reserver = 10 debug objclass = 20' CMDSDEBUG=' debug ms = 1 -- 2.47.3