From c5ec95d7c3f1a4ed4f089b19162289db163f97a7 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 1 Aug 2019 10:13:29 -0400 Subject: [PATCH] vstart: move common rgw config to [client.rgw] multisite tests in src/test/rgw/test_multi.py run vstart.sh with RGW=0 because it does some extra configuration before starting radosgw with src/mrgw.sh. the result is that vstart.sh doesn't add extra config sections for [client.rgw.{port}], so these settings don't take effect moving the common config into [client.rgw] allows the settings to apply without relying on vstart.sh to create the additional sections for each gateway Signed-off-by: Casey Bodley --- src/vstart.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/vstart.sh b/src/vstart.sh index b258cde9ac4..f0f2f07a3c4 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -528,12 +528,6 @@ do_rgw_conf() { [client.rgw.${current_port}] rgw frontends = $rgw_frontend port=${current_port} admin socket = ${CEPH_OUT_DIR}/radosgw.${current_port}.asok - ; needed for s3tests - rgw crypt s3 kms encryption keys = testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo= - rgw crypt require ssl = false - ; uncomment the following to set LC days as the value in seconds; - ; needed for passing lc time based s3-tests (can be verbose) - ; rgw lc debug interval = 10 EOF current_port=$((current_port + 1)) done @@ -660,6 +654,14 @@ EOF keyring = $keyring_fn log file = $CEPH_OUT_DIR/\$name.\$pid.log admin socket = $CEPH_ASOK_DIR/\$name.\$pid.asok + +[client.rgw] + ; needed for s3tests + rgw crypt s3 kms encryption keys = testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo= + rgw crypt require ssl = false + ; uncomment the following to set LC days as the value in seconds; + ; needed for passing lc time based s3-tests (can be verbose) + ; rgw lc debug interval = 10 $extra_conf EOF