]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tasks/ceph: pull each mon dir only once
authorJosh Durgin <jdurgin@redhat.com>
Wed, 30 Mar 2016 00:10:28 +0000 (17:10 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Mon, 9 May 2016 21:55:26 +0000 (14:55 -0700)
No need to pull all mon dirs for the host for each mon on the host.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
tasks/ceph.py

index ef60243adcaf0ac2ea7957eccf65c4b7eb899ce0..2351e1053d51d65c2f0f5e3127207c55c3b0ee7c 100644 (file)
@@ -907,9 +907,12 @@ def cluster(ctx, config):
                 for role in roles:
                     is_mon = teuthology.is_type('mon', cluster_name)
                     if is_mon(role):
+                        _, _, id_ = teuthology.split_role(role)
+                        mon_dir = '/var/lib/ceph/mon/' + \
+                                  '{0}-{1}'.format(cluster_name, id_)
                         teuthology.pull_directory_tarball(
                             remote,
-                            '/var/lib/ceph/mon',
+                            mon_dir,
                             path + '/' + role + '.tgz')
 
         log.info('Cleaning ceph cluster...')