Merge pull request #23812 from ceph/backport-mimic-23788

mimic: ceph-volume: tests.functional inherit SSH_ARGS from ansible Reviewed-by: Alfredo Deza <adeza@redhat.com>
ceph · Aug 29, 2018 · fdcc0d3 · fdcc0d3
2 parents 1b6a7e8 + 7962d49
commit fdcc0d3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/ceph-volume/ceph_volume/devices/lvm/batch.py b/src/ceph-volume/ceph_volume/devices/lvm/batch.py
@@ -137,7 +137,7 @@ def report(self, args):
             raise RuntimeError('report format must be "pretty" or "json"')
 
     def execute(self, args):
-        strategy = get_strategy(self.get_filtered_devices(args.devices), args)
+        strategy = get_strategy(args)
         if not args.yes:
             strategy.report_pretty()
             terminal.info('The above OSDs would be created if the operation continues')

diff --git a/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py b/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py
@@ -181,7 +181,7 @@ def compute(self):
             osds.append(osd)
 
         self.computed['vgs'] = [{
-            'devices': [d['path'] for d in self.ssds],
+            'devices': [d.abspath for d in self.ssds],
             'parts': self.db_lvs,
             'percentages': self.vg_extents['percentages'],
             'sizes': self.vg_extents['sizes'],

diff --git a/src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml b/src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml
@@ -104,13 +104,15 @@
       synchronize:
         src: "{{ toxinidir}}/../../../../ceph_volume"
         dest: "/usr/lib/python2.7/site-packages"
+        use_ssh_args: true
       when: ansible_os_family == "RedHat"
 
     - name: rsync ceph-volume to test nodes on ubuntu
       synchronize:
         src: "{{ toxinidir}}/../../../../ceph_volume"
         dest: "/usr/lib/python2.7/dist-packages"
-      when: ansible_os_family == "Ubuntu"
+        use_ssh_args: true
+      when: ansible_os_family == "Debian"
 
 - hosts: osds
   gather_facts: false