Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mimic: ceph-volume: tests.functional inherit SSH_ARGS from ansible #23812

Merged
merged 4 commits into from Aug 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ceph-volume/ceph_volume/devices/lvm/batch.py
Expand Up @@ -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')
Expand Down
Expand Up @@ -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'],
Expand Down
Expand Up @@ -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
Expand Down