]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
ceph-volume: fix regression introcuded via #43536 44757/head
authorGuillaume Abrioux <gabrioux@redhat.com>
Mon, 10 Jan 2022 09:21:53 +0000 (10:21 +0100)
committerGuillaume Abrioux <gabrioux@redhat.com>
Thu, 20 Jan 2022 19:34:27 +0000 (20:34 +0100)
commit653559c9a1ea201f046679b4b1a7fdd6dc5f5405
tree3c88d22aa6233bdf21b6ed6da874564c366ad404
parent653efc847ae4cf34d9f5f57d438a6ef3e4619fe0
ceph-volume: fix regression introcuded via #43536

The recent changes from PR #43536 introduced a regeression preventing from
running ceph-volume in a containerized context on Ubuntu 18.04.

Given that the path for the binary `lvs` differs between CentOS 8 and Ubuntu 18.04.
(`/usr/sbin/lvs` and `/sbin/lvs` respictively). It means that ceph-volume running
in the container on CentOS 8 sees the `lvs` binary at `/usr/sbin/lvs` and try to
run it with `nsenter` on the host which is running Ubuntu 18.04.

Fixes: https://tracker.ceph.com/issues/53812
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 95e88cda3df76b59b548ae808df0ef7f19db1f63)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 3c93ffdc92d4d03b9ae7415b548192a572cfc5ea)
src/ceph-volume/ceph_volume/process.py
src/ceph-volume/ceph_volume/tests/util/test_system.py
src/ceph-volume/ceph_volume/util/system.py