]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr/ssh: Disable host labels.
authorSebastian Wagner <sebastian.wagner@suse.com>
Wed, 27 Nov 2019 12:49:02 +0000 (13:49 +0100)
committerSebastian Wagner <sebastian.wagner@suse.com>
Wed, 27 Nov 2019 12:49:02 +0000 (13:49 +0100)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
src/pybind/mgr/ssh/module.py
src/pybind/mgr/ssh/tests/fixtures.py

index 790e6b2c44a959ff04e2e886150d7a5b4f06bbe8..92f0d9803024cb4a1439a918c875bd7d5fc7dac9 100644 (file)
@@ -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):
index 12caf4de64f8123391b78638eed03597f1c5186b..eddfbe55e03172ec2817c1e00a8e4c5b9451dc3a 100644 (file)
@@ -35,6 +35,7 @@ def ssh_module():
             'ssh_config': '',
             'ssh_identity_key': '',
             'ssh_identity_pub': '',
+            'inventory': {},
         }
         m.__init__('ssh', 0, 0)
         yield m