From: Adam King Date: Mon, 19 Jun 2023 20:07:31 +0000 (-0400) Subject: mgr/cephadm: add extra_entrypoint_args to mon spec X-Git-Tag: v17.2.8~494^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ba7280fd623ffd18063f5d668cb916fda45f020c;p=ceph.git mgr/cephadm: add extra_entrypoint_args to mon spec 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 (cherry picked from commit 370836d46475d8daa6b26acd6f5330abb932bfed) Conflicts: src/python-common/ceph/deployment/service_spec.py --- diff --git a/src/python-common/ceph/deployment/service_spec.py b/src/python-common/ceph/deployment/service_spec.py index a8acf839f7d0..559630531061 100644 --- a/src/python-common/ceph/deployment/service_spec.py +++ b/src/python-common/ceph/deployment/service_spec.py @@ -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