From: Sage Weil <sage@newdream.net>
Date: Wed, 10 Mar 2021 22:50:22 +0000 (-0500)
Subject: mgr/cephadm: fix rgw ssl cert/key config-key path
X-Git-Tag: v17.1.0~2601^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=375cabe5236ddbb6cbb4a31038f814b81571cc17;p=ceph.git

mgr/cephadm: fix rgw ssl cert/key config-key path

I broke this when making the realm and zone optional.

Fixes: af0216d93fb522d239b10b5d7d18208ee02fed77
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 6513cbf7a497..fd5db81507f8 100644
--- a/src/pybind/mgr/cephadm/services/cephadmservice.py
+++ b/src/pybind/mgr/cephadm/services/cephadmservice.py
@@ -714,7 +714,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.rgw_realm}/{spec.rgw_zone}.crt',
+                'key': f'rgw/cert/{spec.service_name()}.crt',
                 'val': cert_data,
             })
 
@@ -729,7 +729,7 @@ class RgwService(CephService):
                     % spec.rgw_frontend_ssl_key)
             ret, out, err = self.mgr.check_mon_command({
                 'prefix': 'config-key set',
-                'key': f'rgw/cert/{spec.rgw_realm}/{spec.rgw_zone}.key',
+                'key': f'rgw/cert/{spec.service_name()}.key',
                 'val': key_data,
             })
 
@@ -749,8 +749,8 @@ class RgwService(CephService):
         args = []
         if spec.ssl:
             args.append(f"ssl_port={daemon_spec.ports[0]}")
-            args.append(f"ssl_certificate=config://rgw/cert/{spec.rgw_realm}/{spec.rgw_zone}.crt")
-            args.append(f"ssl_key=config://rgw/cert/{spec.rgw_realm}/{spec.rgw_zone}.key")
+            args.append(f"ssl_certificate=config://rgw/cert/{spec.service_name()}.crt")
+            args.append(f"ssl_key=config://rgw/cert/{spec.service_name()}.key")
         else:
             args.append(f"port={daemon_spec.ports[0]}")
         frontend = f'beast {" ".join(args)}'