]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: set host crush location based on HostSpec
authorSage Weil <sage@newdream.net>
Fri, 30 Apr 2021 15:10:38 +0000 (11:10 -0400)
committerSage Weil <sage@newdream.net>
Tue, 4 May 2021 12:21:19 +0000 (08:21 -0400)
Signed-off-by: Sage Weil <sage@newdream.net>
src/pybind/mgr/cephadm/module.py

index 4a8454e12840f38b19ae910b24b18b9fd0354f74..08813a4653d008da9b25f48fe57c59502c24f819 100644 (file)
@@ -1400,6 +1400,15 @@ Then run the following:
             raise OrchestratorError('New host %s (%s) failed check(s): %s' % (
                 spec.hostname, spec.addr, errors))
 
+        # prime crush map?
+        if spec.location:
+            self.check_mon_command({
+                'prefix': 'osd crush add-bucket',
+                'name': spec.hostname,
+                'type': 'host',
+                'args': [f'{k}={v}' for k, v in spec.location.items()],
+            })
+
         self.inventory.add_host(spec)
         self.cache.prime_empty_host(spec.hostname)
         self.offline_hosts_remove(spec.hostname)