diff options
| author | Adam King <47704447+adk3798@users.noreply.github.com> | 2024-10-30 20:56:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-30 20:56:30 +0100 |
| commit | 2cbef7195a4bb6be0a34a3fc11e60047906247e5 (patch) | |
| tree | 8188664d5dcb7887ef8e55c19cb33c25623d1a75 /src/pybind/mgr/cephadm/services | |
| parent | Merge pull request #60377 from adk3798/cephadm-share-default-images (diff) | |
| parent | mgr/dashboard: rm nvmeof conf based on its daemon name (diff) | |
| download | ceph-2cbef7195a4bb6be0a34a3fc11e60047906247e5.tar.xz ceph-2cbef7195a4bb6be0a34a3fc11e60047906247e5.zip | |
Merge pull request #60451 from rhcs-dashboard/nvmeof-conf-rm-fix
mgr/dashboard: rm nvmeof conf based on its daemon name
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Afreen Misbah <afreen23.git@gmail.com>
Diffstat (limited to 'src/pybind/mgr/cephadm/services')
| -rw-r--r-- | src/pybind/mgr/cephadm/services/nvmeof.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/pybind/mgr/cephadm/services/nvmeof.py b/src/pybind/mgr/cephadm/services/nvmeof.py index 4451e29878d..13f75881453 100644 --- a/src/pybind/mgr/cephadm/services/nvmeof.py +++ b/src/pybind/mgr/cephadm/services/nvmeof.py @@ -185,19 +185,21 @@ class NvmeofService(CephService): # to clean the keyring up super().post_remove(daemon, is_failed_deploy=is_failed_deploy) service_name = daemon.service_name() + daemon_name = daemon.name() # remove config for dashboard nvmeof gateways if any - ret, out, err = self.mgr.mon_command({ + ret, _, err = self.mgr.mon_command({ 'prefix': 'dashboard nvmeof-gateway-rm', 'name': service_name, + 'daemon_name': daemon_name }) if not ret: - logger.info(f'{daemon.hostname} removed from nvmeof gateways dashboard config') + logger.info(f'{daemon_name} removed from nvmeof gateways dashboard config') spec = cast(NvmeofServiceSpec, self.mgr.spec_store.all_specs.get(daemon.service_name(), None)) if not spec: - self.mgr.log.error(f'Failed to find spec for {daemon.name()}') + self.mgr.log.error(f'Failed to find spec for {daemon_name}') return pool = spec.pool group = spec.group |