]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #61824 from ShwetaBhosale1/fix_issue_69942_prometheus_not_adding_h...
authorAdam King <47704447+adk3798@users.noreply.github.com>
Tue, 25 Mar 2025 17:27:20 +0000 (13:27 -0400)
committerGitHub <noreply@github.com>
Tue, 25 Mar 2025 17:27:20 +0000 (13:27 -0400)
mgr/cephadm: Deploying prometheus service for the first time, does not update PROMETHEUS_API_HOST url under mgr module

Reviewed-by: Adam King <adking@redhat.com>
1  2 
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/serve.py
src/pybind/mgr/cephadm/tests/test_cephadm.py
src/pybind/mgr/orchestrator/_interface.py

index f69bf6d9c1bb726cfdf0a54e0405089485b60c4a,b559fae82faaf7a707e4751aa465f27a77c5f395..ef9a43571b839b11945eaec5280a8ae3f9ae9c39
@@@ -43,9 -42,8 +43,9 @@@ from ceph.deployment.service_spec impor
      MgmtGatewaySpec,
      NvmeofServiceSpec,
  )
 +from ceph.deployment.drive_group import DeviceSelection
  from ceph.utils import str_to_datetime, datetime_to_str, datetime_now
- from cephadm.serve import CephadmServe
+ from cephadm.serve import CephadmServe, REQUIRES_POST_ACTIONS
  from cephadm.services.cephadmservice import CephadmDaemonDeploySpec
  from cephadm.http_server import CephadmHttpServer
  from cephadm.agent import CephadmAgentHelpers
Simple merge