diff --git a/src/ceph-volume/ceph_volume/devices/lvm/batch.py b/src/ceph-volume/ceph_volume/devices/lvm/batch.py index 1c52278c52c3c..4086064f5bdca 100644 --- 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 index 5011922f19a25..7b6052607af3b 100644 --- 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 index 6561e6e51d427..ff3954b217850 100644 --- 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