cephadm: move init container script generation to a function

Move the generation of the init container run script to a small function
fixing a missing `set -e` along the way. This isolates the logic of
generating this run script.

Signed-off-by: John Mulligan <jmulligan@redhat.com>

diff --git a/src/cephadm/cephadmlib/runscripts.py b/src/cephadm/cephadmlib/runscripts.py
index bfa73edbd7d129e0c07724045934a2f2ec4c72a5..52694b16b9c0cace6b93f5a3b458db69c066ff8e 100644 (file)
--- a/src/cephadm/cephadmlib/runscripts.py
+++ b/src/cephadm/cephadmlib/runscripts.py
@@ -91,10 +91,7 @@ def write_service_scripts(
         # init-container commands
         if init_containers:
             initf = estack.enter_context(write_new(initctr_file_path))
-            _write_init_container_cmds_clean(ctx, initf, init_containers[0])
-            for idx, ic in enumerate(init_containers):
-                _write_init_container_cmds(ctx, initf, idx, ic)
-            initf.write('exit 0\n')
+            _write_init_containers_script(ctx, initf, init_containers)
 
         # sidecar container scripts
         for sidecar in sidecars or []:
@@ -220,6 +217,18 @@ def _write_stop_actions(
     )
 
 
+def _write_init_containers_script(
+    ctx: CephadmContext,
+    file_obj: IO[str],
+    init_containers: List[InitContainer],
+) -> None:
+    file_obj.write('set -e\n')
+    _write_init_container_cmds_clean(ctx, file_obj, init_containers[0])
+    for idx, ic in enumerate(init_containers):
+        _write_init_container_cmds(ctx, file_obj, idx, ic)
+    file_obj.write('exit 0\n')
+
+
 def _write_sidecar_script(
     ctx: CephadmContext,
     file_obj: IO[str],