RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

vstart: move common rgw config to [client.rgw]

Browse Source 
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>
This commit is contained in:
Casey Bodley 2019-08-01 10:13:29 -04:00
parent b6da01e75f
commit c5ec95d7c3
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/vstart.sh
View File

@ -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