]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commit
mgr/cephadm: Allow Ingress service to expose the metrics via HTTPS also add fields...
authorShweta Bhosale <Shweta.Bhosale1@ibm.com>
Wed, 3 Sep 2025 14:37:53 +0000 (20:07 +0530)
committerAdam King <adking@redhat.com>
Thu, 25 Sep 2025 21:05:34 +0000 (17:05 -0400)
commit95e3c129d22098dc54de30067a1f674a4163a80c
treeecfbbd53c083731119865bd7252a4b91a4a4f879
parent1fa7ad7aab56c41d4e7576fd6174fff7d0d36cd2
mgr/cephadm: Allow Ingress service to expose the metrics via HTTPS also add fields in spec to accept monitor ips/ monitor networks

Fixes: https://tracker.ceph.com/issues/71707
Signed-off-by: Shweta Bhosale <Shweta.Bhosale1@ibm.com>
(cherry picked from commit da5d3ab0f32dc9e19da73ae01a0dbb95b2d1f8b6)

Conflicts:
src/pybind/mgr/cephadm/services/ingress.py
src/pybind/mgr/cephadm/services/service_discovery.py
src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2
src/pybind/mgr/cephadm/tests/test_services.py
src/python-common/ceph/deployment/service_spec.py

Resolves: rhbz#2353516
doc/cephadm/services/rgw.rst
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/services/ingress.py
src/pybind/mgr/cephadm/services/monitoring.py
src/pybind/mgr/cephadm/services/service_discovery.py
src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2
src/pybind/mgr/cephadm/tests/test_service_discovery.py
src/pybind/mgr/cephadm/tests/test_services.py
src/python-common/ceph/deployment/service_spec.py
src/python-common/ceph/tests/test_service_spec.py