]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #58753 from adk3798/quincy-only-bind-to-network
authorAdam King <47704447+adk3798@users.noreply.github.com>
Wed, 7 Aug 2024 21:37:48 +0000 (17:37 -0400)
committerGitHub <noreply@github.com>
Wed, 7 Aug 2024 21:37:48 +0000 (17:37 -0400)
quincy: mgr/cephadm: add ability for haproxy, prometheus, grafana to bind on specific ip

Reviewed-by: John Mulligan <jmulligan@redhat.com>
1  2 
src/cephadm/cephadm
src/cephadm/tests/test_cephadm.py
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/serve.py
src/pybind/mgr/cephadm/tests/test_services.py
src/python-common/ceph/deployment/service_spec.py

Simple merge
Simple merge
Simple merge
Simple merge
index c25e951cad97efea7778cf14ba452e827d6577da,4dda9da985993bb32e8f92ef50823d50210df358..17891d2189ae3fe40ad5d7984263e670aac170de
@@@ -1432,9 -1315,10 +1432,10 @@@ class GrafanaSpec(MonitoringSpec)
                   preview_only: bool = False,
                   config: Optional[Dict[str, str]] = None,
                   networks: Optional[List[str]] = None,
+                  only_bind_port_on_networks: bool = False,
                   port: Optional[int] = None,
                   initial_admin_password: Optional[str] = None,
 -                 anonymous_access: Optional[bool] = True,
 +                 anonymous_access: bool = True,
                   extra_container_args: Optional[List[str]] = None,
                   extra_entrypoint_args: Optional[List[str]] = None,
                   custom_configs: Optional[List[CustomConfig]] = None,