From: John Mulligan Date: Mon, 11 Dec 2023 20:44:41 +0000 (-0500) Subject: cephadm: add stop and poststop commands to init container service X-Git-Tag: v19.3.0~284^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e31ef9a379c63e62c7b6887228f41dbf1f49a204;p=ceph-ci.git cephadm: add stop and poststop commands to init container service Now that there is a more robust init_containers.run script, we can use the new stop and poststop subcommands from the systemd unit. Signed-off-by: John Mulligan --- diff --git a/src/cephadm/cephadmlib/templates/init_ctr.service.j2 b/src/cephadm/cephadmlib/templates/init_ctr.service.j2 index 1562a5b1818..730d5043dec 100644 --- a/src/cephadm/cephadmlib/templates/init_ctr.service.j2 +++ b/src/cephadm/cephadmlib/templates/init_ctr.service.j2 @@ -17,6 +17,8 @@ LimitNOFILE=1048576 LimitNPROC=1048576 EnvironmentFile=-/etc/environment ExecStart=/bin/bash {{ ctx.data_dir }}/{{ identity.fsid }}/%i/init_containers.run +ExecStop=/bin/bash {{ ctx.data_dir }}/{{ identity.fsid }}/%i/init_containers.run stop +ExecStopPost=-/bin/bash {{ ctx.data_dir }}/{{ identity.fsid }}/%i/init_containers.run poststop Restart=on-failure RestartSec=10s TimeoutStopSec=120