From: Sage Weil <sage@newdream.net>
Date: Wed, 10 Mar 2021 19:50:30 +0000 (-0500)
Subject: mgr/cephadm: fix beast private key config option
X-Git-Tag: v16.2.0~73^2~33
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cec4d8213c691b22c1b7e71c8ab33156e8a1922a;p=ceph.git

mgr/cephadm: fix beast private key config option

This has always been broken.  However, beast SSL will also accept a pem
(cert + key) via the ssl_certificate option, so any existing non-broken
users (if they exist) must be using that.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 7ec7403e16d20cbf247dcd60c0dc2da3b868253c)
---

diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py
index a3e2176a78f8..af435af542ea 100644
--- a/src/pybind/mgr/cephadm/services/cephadmservice.py
+++ b/src/pybind/mgr/cephadm/services/cephadmservice.py
@@ -750,7 +750,7 @@ class RgwService(CephService):
         if spec.ssl:
             args.append(f"ssl_port={daemon_spec.ports[0]}")
             args.append(f"ssl_certificate=config://rgw/cert/{spec.service_name()}.crt")
-            args.append(f"ssl_key=config://rgw/cert/{spec.service_name()}.key")
+            args.append(f"ssl_private_key=config://rgw/cert/{spec.service_name()}.key")
         else:
             args.append(f"port={daemon_spec.ports[0]}")
         frontend = f'beast {" ".join(args)}'