From f2dcb02d213e862c5a5498c2d12cd86b22676c84 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 28 Feb 2019 10:54:03 +0100 Subject: [PATCH] tests: update ceph_volume tests accordingly to change introduced by b5548ea9412cd7741bee993dddcbfd9daa34cb02 Signed-off-by: Guillaume Abrioux --- library/test_ceph_volume.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/library/test_ceph_volume.py b/library/test_ceph_volume.py index 4aba8e732..a4688dc09 100644 --- a/library/test_ceph_volume.py +++ b/library/test_ceph_volume.py @@ -42,7 +42,7 @@ class TestCephVolumeModule(object): def test_container_exec(self): fake_binary = "ceph-volume" fake_container_image = "docker.io/ceph/daemon:latest-luminous" - expected_command_list = ['docker', 'run', '--rm', '--privileged', '--net=host', # noqa E501 + expected_command_list = ['docker', 'run', '--rm', '--privileged', '--net=host', '--ipc=host', # noqa E501 '-v', '/run/lock/lvm:/run/lock/lvm:z', '-v', '/var/run/udev/:/var/run/udev/:z', '-v', '/dev:/dev', '-v', '/etc/ceph:/etc/ceph:z', # noqa E501 @@ -58,7 +58,7 @@ class TestCephVolumeModule(object): fake_module = MagicMock() fake_module.params = {'data': '/dev/sda'} fake_container_image = "docker.io/ceph/daemon:latest-luminous" - expected_command_list = ['docker', 'run', '--rm', '--privileged', '--net=host', # noqa E501 + expected_command_list = ['docker', 'run', '--rm', '--privileged', '--net=host', '--ipc=host', # noqa E501 '-v', '/run/lock/lvm:/run/lock/lvm:z', '-v', '/var/run/udev/:/var/run/udev/:z', '-v', '/dev:/dev', '-v', '/etc/ceph:/etc/ceph:z', # noqa E501 @@ -126,7 +126,7 @@ class TestCephVolumeModule(object): fake_module = MagicMock() fake_module.params = {'cluster': 'ceph', 'data': '/dev/sda'} fake_container_image = "docker.io/ceph/daemon:latest-luminous" - expected_command_list = ['docker', 'run', '--rm', '--privileged', '--net=host', # noqa E501 + expected_command_list = ['docker', 'run', '--rm', '--privileged', '--net=host', '--ipc=host', # noqa E501 '-v', '/run/lock/lvm:/run/lock/lvm:z', '-v', '/var/run/udev/:/var/run/udev/:z', '-v', '/dev:/dev', '-v', '/etc/ceph:/etc/ceph:z', # noqa E501 @@ -158,7 +158,7 @@ class TestCephVolumeModule(object): def test_list_storage_inventory_container(self): fake_module = MagicMock() fake_container_image = "docker.io/ceph/daemon:latest-luminous" - expected_command_list = ['docker', 'run', '--rm', '--privileged', '--net=host', # noqa E501 + expected_command_list = ['docker', 'run', '--rm', '--privileged', '--net=host', '--ipc=host', # noqa E501 '-v', '/run/lock/lvm:/run/lock/lvm:z', '-v', '/var/run/udev/:/var/run/udev/:z', '-v', '/dev:/dev', '-v', '/etc/ceph:/etc/ceph:z', # noqa E501 @@ -181,7 +181,7 @@ class TestCephVolumeModule(object): fake_action = "create" fake_container_image = "docker.io/ceph/daemon:latest-luminous" - expected_command_list = ['docker', 'run', '--rm', '--privileged', '--net=host', # noqa E501 + expected_command_list = ['docker', 'run', '--rm', '--privileged', '--net=host', '--ipc=host', # noqa E501 '-v', '/run/lock/lvm:/run/lock/lvm:z', '-v', '/var/run/udev/:/var/run/udev/:z', '-v', '/dev:/dev', '-v', '/etc/ceph:/etc/ceph:z', # noqa E501 @@ -229,7 +229,7 @@ class TestCephVolumeModule(object): fake_action = "prepare" fake_container_image = "docker.io/ceph/daemon:latest-luminous" - expected_command_list = ['docker', 'run', '--rm', '--privileged', '--net=host', # noqa E501 + expected_command_list = ['docker', 'run', '--rm', '--privileged', '--net=host', '--ipc=host', # noqa E501 '-v', '/run/lock/lvm:/run/lock/lvm:z', '-v', '/var/run/udev/:/var/run/udev/:z', '-v', '/dev:/dev', '-v', '/etc/ceph:/etc/ceph:z', # noqa E501 @@ -278,7 +278,7 @@ class TestCephVolumeModule(object): 'batch_devices': ["/dev/sda", "/dev/sdb"]} fake_container_image = "docker.io/ceph/daemon:latest-luminous" - expected_command_list = ['docker', 'run', '--rm', '--privileged', '--net=host', # noqa E501 + expected_command_list = ['docker', 'run', '--rm', '--privileged', '--net=host', '--ipc=host', # noqa E501 '-v', '/run/lock/lvm:/run/lock/lvm:z', '-v', '/var/run/udev/:/var/run/udev/:z', '-v', '/dev:/dev', '-v', '/etc/ceph:/etc/ceph:z', # noqa E501