]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
cephadm: add test assertions for ceph mgr entrypoint, mounts
authorJohn Mulligan <jmulligan@redhat.com>
Sat, 21 Oct 2023 20:08:25 +0000 (16:08 -0400)
committerJohn Mulligan <jmulligan@redhat.com>
Sun, 22 Oct 2023 12:29:03 +0000 (08:29 -0400)
Part of a series of commits to increase coverage of deployment
path features with regards to container engine options, env vars
and mounts. This will serve future refactoring efforts.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
src/cephadm/tests/test_deploy.py

index bdadcf9906bcecc652ff429f282141ba3138e2c4..1c877df6bf527fe300d10f382fd936f076a61683 100644 (file)
@@ -370,6 +370,9 @@ def test_deploy_ceph_mgr_container(cephadm_fs, monkeypatch):
     )
     assert '-e TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES' in runfile_lines[-1]
     assert '--pids-limit' in runfile_lines[-1]
+    assert '--entrypoint /usr/bin/ceph-mgr' in runfile_lines[-1]
+    assert f'-v /var/lib/ceph/{fsid}/mgr.foo:/var/lib/ceph/mgr/ceph-foo:z' in runfile_lines[-1]
+    assert f'-v /var/log/ceph/{fsid}:/var/log/ceph:z' in runfile_lines[-1]
     _firewalld().open_ports.assert_not_called()
     with open(basedir / 'config') as f:
         assert f.read() == 'XXXXXXX'