From 7a801cb13fe7ae5079b6ecaf3e76c183d87d8d47 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Wed, 27 Nov 2019 13:49:02 +0100 Subject: [PATCH] mgr/ssh: Disable host labels. Signed-off-by: Sebastian Wagner --- src/pybind/mgr/ssh/module.py | 4 ++-- src/pybind/mgr/ssh/tests/fixtures.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/ssh/module.py b/src/pybind/mgr/ssh/module.py index 790e6b2c44a95..92f0d9803024c 100644 --- a/src/pybind/mgr/ssh/module.py +++ b/src/pybind/mgr/ssh/module.py @@ -639,7 +639,7 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator): """ return [orchestrator.InventoryNode(host_name) for host_name in self.inventory_cache] -""" + """ def add_host_label(self, host, label): if host not in self.inventory: raise OrchestratorError('host %s does not exist' % host) @@ -671,7 +671,7 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator): return SSHWriteCompletion( self._worker_pool.apply_async(run, (host, label))) -""" + """ @async_map_completion def _refresh_host_services(self, host): diff --git a/src/pybind/mgr/ssh/tests/fixtures.py b/src/pybind/mgr/ssh/tests/fixtures.py index 12caf4de64f81..eddfbe55e0317 100644 --- a/src/pybind/mgr/ssh/tests/fixtures.py +++ b/src/pybind/mgr/ssh/tests/fixtures.py @@ -35,6 +35,7 @@ def ssh_module(): 'ssh_config': '', 'ssh_identity_key': '', 'ssh_identity_pub': '', + 'inventory': {}, } m.__init__('ssh', 0, 0) yield m -- 2.47.3