From: Casey Bodley Date: Thu, 22 Jun 2017 20:46:10 +0000 (-0400) Subject: vstart: remove rgw_enable_static_website X-Git-Tag: v12.1.2~1^2~37^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2b7cd0f281e8a4efbf50bbd84b2143214ce9eae9;p=ceph.git vstart: remove rgw_enable_static_website this was recently added for s3tests, but rgw_enable_static_website isn't enough to get the test_s3website.py tests to pass. they're skipped if rgw_enable_static_website is false, so enabling this just caused them to fail instead Signed-off-by: Casey Bodley --- diff --git a/src/vstart.sh b/src/vstart.sh index f796a3c721a8..258f63985d8a 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -412,7 +412,6 @@ prepare_conf() { osd pool default erasure code profile = plugin=jerasure technique=reed_sol_van k=2 m=1 ruleset-failure-domain=osd rgw frontends = $rgw_frontend port=$CEPH_RGW_PORT ; needed for s3tests - rgw enable static website = 1 rgw crypt s3 kms encryption keys = testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo= rgw crypt require ssl = false rgw lc debug interval = 10