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 <cbodley@redhat.com>

diff --git a/src/vstart.sh b/src/vstart.sh
index b258cde9ac4706895034a897cdfe6c772eff257a..f0f2f07a3c41e766b3279ec0b34017bb01b0b893 100755 (executable)
--- 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