]> git.apps.os.sepia.ceph.com Git - ceph.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>
Wed, 17 Mar 2021 21:24:19 +0000 (16:24 -0500)
commit60103d084872cebcfeaffc4f0549b651d0d57ea3
tree0e8b89af19b8ea6613b8b72f6949259cf186d8e9
parentcec4d8213c691b22c1b7e71c8ab33156e8a1922a
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>
(cherry picked from commit 4fe35117ce2349adc023604ead1c37c8680b90c4)
src/cephadm/samples/rgw_ssl.json
src/pybind/mgr/cephadm/services/cephadmservice.py
src/python-common/ceph/deployment/service_spec.py