From 7ff38a68b3bb1ea7e26d6f6cd650a9f47cfcf049 Mon Sep 17 00:00:00 2001 From: Adam King Date: Thu, 4 Apr 2024 12:28:45 -0400 Subject: [PATCH] mgr/cephadm: rename ceph_admin_key -> client_key in _calc_client_files I think this variable name is misleading, as we use this same logic for all client-keyrings that can be setup, not just the client.admin keyring Signed-off-by: Adam King (cherry picked from commit 9e2327f0c5f0c103e2db8c7d86ceddd177179df9) --- src/pybind/mgr/cephadm/serve.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py index 33ec35de70d61..b7e75f8abf603 100644 --- a/src/pybind/mgr/cephadm/serve.py +++ b/src/pybind/mgr/cephadm/serve.py @@ -1234,9 +1234,9 @@ class CephadmServe: ceph_conf = (0o644, 0, 0, bytes(config), str(config_digest)) client_files[host]['/etc/ceph/ceph.conf'] = ceph_conf client_files[host][f'{cluster_cfg_dir}/ceph.conf'] = ceph_conf - ceph_admin_key = (ks.mode, ks.uid, ks.gid, keyring.encode('utf-8'), digest) - client_files[host][ks.path] = ceph_admin_key - client_files[host][f'{cluster_cfg_dir}/{os.path.basename(ks.path)}'] = ceph_admin_key + client_key = (ks.mode, ks.uid, ks.gid, keyring.encode('utf-8'), digest) + client_files[host][ks.path] = client_key + client_files[host][f'{cluster_cfg_dir}/{os.path.basename(ks.path)}'] = client_key except Exception as e: self.log.warning( f'unable to calc client keyring {ks.entity} placement {ks.placement}: {e}') -- 2.39.5