From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 20 Aug 2019 18:19:59 +0000 (-0400)
Subject: vstart: move [client.rgw] config into [client]
X-Git-Tag: v15.1.0~1793^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=99a329e96debe4723e5f58dab4a705359d03d5a6;p=ceph.git

vstart: move [client.rgw] config into [client]

common rgw config was moved into [client.rgw] with the intent to
cover radosgw in multisite tests too, but this broke the default case
where radosgws are named after [client.rgw.port]. move the common stuff
to [client] so it does actually apply to both

Fixes: https://tracker.ceph.com/issues/41212

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index 0001302ccee0..ffe43fda1460 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -655,7 +655,6 @@ EOF
         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