From ed560e48b742b668c96aadeffef1cbeea359cdf4 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Tue, 28 Aug 2018 15:34:58 -0700 Subject: [PATCH 1/4] ceph-volume tests.functional inherit SSH_ARGS from ansible with synchronize module Signed-off-by: Alfredo Deza (cherry picked from commit 8e6269336f6e177f415a51e9fedd36244014215a) --- .../ceph_volume/tests/functional/playbooks/deploy.yml | 2 ++ 1 file changed, 2 insertions(+) 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..b105fd9890ede 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml +++ b/src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml @@ -104,12 +104,14 @@ 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" + use_ssh_args: true when: ansible_os_family == "Ubuntu" - hosts: osds From b275d0f3ea705a8827e9d2458ac82fbbc010c01b Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 29 Aug 2018 09:55:31 -0700 Subject: [PATCH 2/4] ceph-volume lvm.batch remove usage of non-existent method Signed-off-by: Alfredo Deza (cherry picked from commit 6f3094449f46d10260c0a505b39571c35235292e) --- src/ceph-volume/ceph_volume/devices/lvm/batch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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') From 2fa6ccd7607a0918e8be1f96f4d7bfc65827f7fe Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 29 Aug 2018 09:56:21 -0700 Subject: [PATCH 3/4] ceph-volume lvm.batch use the abspath attribute for Device objects in bluestore Signed-off-by: Alfredo Deza (cherry picked from commit b2a62c2b13d3e079f8020865b7c41f0f6c4b5d71) --- src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'], From 7962d49fa72ba6060e20eef0af74c7ccee9fa10a Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 29 Aug 2018 10:32:55 -0700 Subject: [PATCH 4/4] ceph-volume tests.functional use Debian ansible os family in deploy.yml Signed-off-by: Alfredo Deza (cherry picked from commit 7a076f5e4f58bc3b346cde306ba949aabbb9b743) --- .../ceph_volume/tests/functional/playbooks/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b105fd9890ede..ff3954b217850 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml +++ b/src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml @@ -112,7 +112,7 @@ src: "{{ toxinidir}}/../../../../ceph_volume" dest: "/usr/lib/python2.7/dist-packages" use_ssh_args: true - when: ansible_os_family == "Ubuntu" + when: ansible_os_family == "Debian" - hosts: osds gather_facts: false