mgr/cephadm: rgw: drop .crt extension when storing cert in config-key

This will no affect upgrades since we will run the config() method before
prepare_create() any time we deploy a new daemon on this service, which
means we'll re-store the cert in the new key location before we generate
a new rgw_frontends option that references it.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py
index 40e83c2dc3525fe1e79b9d4fd8638d3b2d0e6d91..1812ebc3817618cd996321cd82c5ba769573e5b8 100644 (file)
--- a/src/pybind/mgr/cephadm/services/cephadmservice.py
+++ b/src/pybind/mgr/cephadm/services/cephadmservice.py
@@ -728,7 +728,7 @@ class RgwService(CephService):
                     % spec.rgw_frontend_ssl_certificate)
             ret, out, err = self.mgr.check_mon_command({
                 'prefix': 'config-key set',
-                'key': f'rgw/cert/{spec.service_name()}.crt',  # NOTE: actually a .pem!
+                'key': f'rgw/cert/{spec.service_name()}',
                 'val': cert_data,
             })
 
@@ -761,7 +761,7 @@ class RgwService(CephService):
                     args.append(f"ssl_endpoint={daemon_spec.ip}:{port}")
                 else:
                     args.append(f"ssl_port={port}")
-                args.append(f"ssl_certificate=config://rgw/cert/{spec.service_name()}.crt")
+                args.append(f"ssl_certificate=config://rgw/cert/{spec.service_name()}")
             else:
                 if daemon_spec.ip:
                     args.append(f"endpoint={daemon_spec.ip}:{port}")
@@ -773,7 +773,7 @@ class RgwService(CephService):
                     args.append(f"port={daemon_spec.ip}:{port}s")  # note the 's' suffix on port
                 else:
                     args.append(f"port={port}s")  # note the 's' suffix on port
-                args.append(f"ssl_certificate=config://rgw/cert/{spec.service_name()}.crt")
+                args.append(f"ssl_certificate=config://rgw/cert/{spec.service_name()}")
             else:
                 if daemon_spec.ip:
                     args.append(f"port={daemon_spec.ip}:{port}")