From eac3ba46b89c09a795c12d6dc45a00cde710a41b Mon Sep 17 00:00:00 2001 From: Adam King Date: Wed, 2 Aug 2023 15:53:10 -0400 Subject: [PATCH] mgr/cephadm: rename "igw_id" to "nvmeof_gw_id" "igw_id" was leftover from the nvmeof implementation being taken heavily from the iscsi implementation. "igw" means nothing in this context, so we can change the name. Signed-off-by: Adam King --- src/pybind/mgr/cephadm/services/nvmeof.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pybind/mgr/cephadm/services/nvmeof.py b/src/pybind/mgr/cephadm/services/nvmeof.py index 01867bbc7ea..7d2dd16cf0d 100644 --- a/src/pybind/mgr/cephadm/services/nvmeof.py +++ b/src/pybind/mgr/cephadm/services/nvmeof.py @@ -25,16 +25,16 @@ class NvmeofService(CephService): assert self.TYPE == daemon_spec.daemon_type spec = cast(NvmeofServiceSpec, self.mgr.spec_store[daemon_spec.service_name].spec) - igw_id = daemon_spec.daemon_id + nvmeof_gw_id = daemon_spec.daemon_id host_ip = self.mgr.inventory.get_addr(daemon_spec.host) - keyring = self.get_keyring_with_caps(self.get_auth_entity(igw_id), + keyring = self.get_keyring_with_caps(self.get_auth_entity(nvmeof_gw_id), ['mon', 'profile rbd', 'osd', 'allow all tag rbd *=*']) # TODO: check if we can force jinja2 to generate dicts with double quotes instead of using json.dumps transport_tcp_options = json.dumps(spec.transport_tcp_options) if spec.transport_tcp_options else None - name = '{}.{}'.format(utils.name_to_config_section('nvmeof'), igw_id) + name = '{}.{}'.format(utils.name_to_config_section('nvmeof'), nvmeof_gw_id) rados_id = name[len('client.'):] if name.startswith('client.') else name context = { 'spec': spec, -- 2.39.5