]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: add extra_entrypoint_args to mon spec
authorAdam King <adking@redhat.com>
Mon, 19 Jun 2023 20:07:31 +0000 (16:07 -0400)
committerAdam King <adking@redhat.com>
Tue, 5 Mar 2024 14:28:54 +0000 (09:28 -0500)
There was no reason for the mon spec to not include
this option. I believe this was just an oversight caused
by the addition of the mon spec and extra_entrypoint_args
in separate PRs around the same time.

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 370836d46475d8daa6b26acd6f5330abb932bfed)

Conflicts:
src/python-common/ceph/deployment/service_spec.py

src/python-common/ceph/deployment/service_spec.py

index a8acf839f7d09a36f6fe739a8831b281ef2db8a5..55963053106119d72d12651245718bcd8fade6f5 100644 (file)
@@ -1560,6 +1560,7 @@ class MONSpec(ServiceSpec):
                  preview_only: bool = False,
                  networks: Optional[List[str]] = None,
                  extra_container_args: Optional[List[str]] = None,
+                 extra_entrypoint_args: Optional[List[str]] = None,
                  custom_configs: Optional[List[CustomConfig]] = None,
                  crush_locations: Optional[Dict[str, List[str]]] = None,
                  ):
@@ -1572,6 +1573,7 @@ class MONSpec(ServiceSpec):
                                       preview_only=preview_only,
                                       networks=networks,
                                       extra_container_args=extra_container_args,
+                                      extra_entrypoint_args=extra_entrypoint_args,
                                       custom_configs=custom_configs)
 
         self.crush_locations = crush_locations