From: John Mulligan <jmulligan@redhat.com>
Date: Thu, 15 Jun 2023 18:39:48 +0000 (-0400)
Subject: pybind/mgr/cephadm: add init_containers field to CephadmDaemonDeploySpec
X-Git-Tag: v19.0.0~711^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8a547ab39715dedfb198ff3bfe9bdcc05fe8f692;p=ceph.git

pybind/mgr/cephadm: add init_containers field to CephadmDaemonDeploySpec

This will permit the transfer of init_containers from a spec to the
structure that actually generates the deploy JSON.

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

diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py
index bdaf9efbb681..625f7604871b 100644
--- a/src/pybind/mgr/cephadm/services/cephadmservice.py
+++ b/src/pybind/mgr/cephadm/services/cephadmservice.py
@@ -14,6 +14,7 @@ from ceph.deployment.service_spec import (
     ArgumentList,
     CephExporterSpec,
     GeneralArgList,
+    InitContainerSpec,
     MONSpec,
     RGWSpec,
     ServiceSpec,
@@ -70,6 +71,7 @@ class CephadmDaemonDeploySpec:
                  rank_generation: Optional[int] = None,
                  extra_container_args: Optional[ArgumentList] = None,
                  extra_entrypoint_args: Optional[ArgumentList] = None,
+                 init_containers: Optional[List[InitContainerSpec]] = None,
                  ):
         """
         A data struction to encapsulate `cephadm deploy ...
@@ -109,6 +111,7 @@ class CephadmDaemonDeploySpec:
 
         self.extra_container_args = extra_container_args
         self.extra_entrypoint_args = extra_entrypoint_args
+        self.init_containers = init_containers
 
     def __setattr__(self, name: str, value: Any) -> None:
         if value is not None and name in ('extra_container_args', 'extra_entrypoint_args'):
@@ -243,6 +246,7 @@ class CephadmService(metaclass=ABCMeta):
                 spec, 'extra_container_args') else None,
             extra_entrypoint_args=spec.extra_entrypoint_args if hasattr(
                 spec, 'extra_entrypoint_args') else None,
+            init_containers=getattr(spec, 'init_containers', None),
         )
 
     def prepare_create(self, daemon_spec: CephadmDaemonDeploySpec) -> CephadmDaemonDeploySpec: