ceph_volume: expose ceph-volume logs on the host

This will tremendously help debugging failures while performing any
ceph-volume command in containers.

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/library/ceph_volume.py b/library/ceph_volume.py
index 416867e6b145d2e3efaa9d24b5eb3d567917d4f3..92413c017e248f83d22dc77f9316ed8ad99c17b0 100644 (file)
--- a/library/ceph_volume.py
+++ b/library/ceph_volume.py
@@ -184,6 +184,7 @@ def container_exec(binary, container_image):
                     '-v', '/dev:/dev', '-v', '/etc/ceph:/etc/ceph:z',
                     '-v', '/run/lvm/lvmetad.socket:/run/lvm/lvmetad.socket',
                     '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
+                    '-v', '/var/log/ceph/:/var/log/ceph/:z',
                     os.path.join('--entrypoint=' + binary),
                     container_image]
     return command_exec

diff --git a/library/test_ceph_volume.py b/library/test_ceph_volume.py
index 2f090a6ac30f912aac60bca265ac2f8e07e168e6..d0cee813f97cd3a28fec9192d1da5ee578c94a26 100644 (file)
--- a/library/test_ceph_volume.py
+++ b/library/test_ceph_volume.py
@@ -44,6 +44,7 @@ class TestCephVolumeModule(object):
                                  '-v', '/dev:/dev', '-v', '/etc/ceph:/etc/ceph:z',  # noqa E501
                                  '-v', '/run/lvm/lvmetad.socket:/run/lvm/lvmetad.socket',  # noqa E501
                                  '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
+                                 '-v', '/var/log/ceph/:/var/log/ceph/:z',
                                  '--entrypoint=ceph-volume',
                                  'docker.io/ceph/daemon:latest-luminous']
         result = ceph_volume.container_exec(fake_binary, fake_container_image)
@@ -58,6 +59,7 @@ class TestCephVolumeModule(object):
                                  '-v', '/dev:/dev', '-v', '/etc/ceph:/etc/ceph:z',  # noqa E501
                                  '-v', '/run/lvm/lvmetad.socket:/run/lvm/lvmetad.socket',  # noqa E501
                                  '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
+                                 '-v', '/var/log/ceph/:/var/log/ceph/:z',
                                  '--entrypoint=ceph-volume',
                                  'docker.io/ceph/daemon:latest-luminous',
                                  'lvm',
@@ -111,6 +113,7 @@ class TestCephVolumeModule(object):
                                  '-v', '/dev:/dev', '-v', '/etc/ceph:/etc/ceph:z',  # noqa E501
                                  '-v', '/run/lvm/lvmetad.socket:/run/lvm/lvmetad.socket',  # noqa E501
                                  '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
+                                 '-v', '/var/log/ceph/:/var/log/ceph/:z',
                                  '--entrypoint=ceph-volume',
                                  'docker.io/ceph/daemon:latest-luminous',
                                  '--cluster',
@@ -136,6 +139,7 @@ class TestCephVolumeModule(object):
                                  '-v', '/dev:/dev', '-v', '/etc/ceph:/etc/ceph:z',  # noqa E501
                                  '-v', '/run/lvm/lvmetad.socket:/run/lvm/lvmetad.socket',  # noqa E501
                                  '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
+                                 '-v', '/var/log/ceph/:/var/log/ceph/:z',
                                  '--entrypoint=ceph-volume',
                                  'docker.io/ceph/daemon:latest-luminous',
                                  '--cluster',
@@ -182,6 +186,7 @@ class TestCephVolumeModule(object):
                                  '-v', '/dev:/dev', '-v', '/etc/ceph:/etc/ceph:z',  # noqa E501
                                  '-v', '/run/lvm/lvmetad.socket:/run/lvm/lvmetad.socket',  # noqa E501
                                  '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
+                                 '-v', '/var/log/ceph/:/var/log/ceph/:z',
                                  '--entrypoint=ceph-volume',
                                  'docker.io/ceph/daemon:latest-luminous',
                                  '--cluster',
@@ -229,6 +234,7 @@ class TestCephVolumeModule(object):
                                  '-v', '/dev:/dev', '-v', '/etc/ceph:/etc/ceph:z',  # noqa E501
                                  '-v', '/run/lvm/lvmetad.socket:/run/lvm/lvmetad.socket',  # noqa E501
                                  '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
+                                 '-v', '/var/log/ceph/:/var/log/ceph/:z',
                                  '--entrypoint=ceph-volume',
                                  'docker.io/ceph/daemon:latest-luminous',
                                  '--cluster',