]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
cehphadm: disable restarting init containers service
authorJohn Mulligan <jmulligan@redhat.com>
Tue, 19 Dec 2023 19:10:39 +0000 (14:10 -0500)
committerJohn Mulligan <jmulligan@redhat.com>
Tue, 2 Jan 2024 14:30:21 +0000 (09:30 -0500)
Disable the Restart= line in the init containers systemd template.
It is commented out as there are probably more appropriate workarounds
to use in the future but this should fix testing on centos8 based
systems.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
src/cephadm/cephadmlib/templates/init_ctr.service.j2

index 730d5043dece62ff322107d25e1ac1af02e70a62..e23a72be40f593c71a011a587565d0aa6f194808 100644 (file)
@@ -19,8 +19,12 @@ 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
+# FIXME: Disable Restart on oneshot service. systemd versions before v224
+# did not allow Restart=on-failure with a oneshot service. Having it set
+# prevents the service from starting on centos8. Disable it for now and
+# revisit this at a later time.
+#Restart=on-failure
+#RestartSec=10s
 TimeoutStopSec=120
 StartLimitInterval=30min
 StartLimitBurst=5