]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
mgr/cephadm: remove ssl_frontend_ssl_key from RGWSpec
authorSage Weil <sage@newdream.net>
Wed, 10 Mar 2021 19:58:09 +0000 (14:58 -0500)
committerSage Weil <sage@newdream.net>
Mon, 15 Mar 2021 22:55:16 +0000 (18:55 -0400)
commit4fe35117ce2349adc023604ead1c37c8680b90c4
treeadb33880e75de0288b5d7fb7ce6e8a7d73aa7137
parent7ec7403e16d20cbf247dcd60c0dc2da3b868253c
mgr/cephadm: remove ssl_frontend_ssl_key from RGWSpec

Since this didn't work anyway, stop collecting and passing through the
private key portion of the certificate.  Instead, users should include
both in the first option.  This is simpler, and provides consistency
across civetweb and beast rgw backends (for whatever that is worth).

NOTE: dashboard changes are not included here.

Signed-off-by: Sage Weil <sage@newdream.net>
src/cephadm/samples/rgw_ssl.json
src/pybind/mgr/cephadm/services/cephadmservice.py
src/python-common/ceph/deployment/service_spec.py