From b03de38f39fe3d34ff4fd78ef83dd9127686014b Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Sat, 17 Sep 2022 03:48:45 +0200 Subject: [PATCH] mgr: do not use ceph/daemon entrypoint This changes the entrypoint used for ceph-mgr containerized daemons in the systemd template. Signed-off-by: Guillaume Abrioux --- roles/ceph-mgr/templates/ceph-mgr.service.j2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/ceph-mgr/templates/ceph-mgr.service.j2 b/roles/ceph-mgr/templates/ceph-mgr.service.j2 index aee87a6ab..419cdacd4 100644 --- a/roles/ceph-mgr/templates/ceph-mgr.service.j2 +++ b/roles/ceph-mgr/templates/ceph-mgr.service.j2 @@ -39,7 +39,10 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm --net=host \ -e TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES={{ ceph_tcmalloc_max_total_thread_cache }} \ {{ ceph_mgr_docker_extra_env }} \ --name=ceph-mgr-{{ ansible_facts['hostname'] }} \ - {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} + --entrypoint=/usr/bin/ceph-mgr \ + {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} \ + -f --default-log-to-file=false --default-log-to-stderr=true \ + -i {{ ansible_facts['hostname'] }} {% if container_binary == 'podman' %} ExecStop=-/usr/bin/sh -c "/usr/bin/{{ container_binary }} rm -f `cat /%t/%n-cid`" {% else %} -- 2.47.3