]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
mgr/cephadm: Fix haproxy not being recognized as a proper daemon 42433/head
authorSebastian Wagner <sewagner@redhat.com>
Wed, 21 Jul 2021 08:45:51 +0000 (10:45 +0200)
committerSebastian Wagner <sewagner@redhat.com>
Thu, 22 Jul 2021 08:55:54 +0000 (10:55 +0200)
commita8f1cf2edb0ef5b48632af8da9577c8a42a6ff60
tree4167df9c0b0388766c3db55fb85e36587b11e023
parentd373d07a9c77cd408107cb15f5b1bfb0e2bc7763
mgr/cephadm: Fix haproxy not being recognized as a proper daemon

Turns out daemon types != service types:

    cephadm [WRN] Found unknown service type haproxy on host smithi019
    cephadm [WRN] Found unknown service type keepalived on host smithi019

leading to `self.mgr.cache.get_daemons_by_service(spec.service_name())`
not returning any daemons.

Fixes: https://tracker.ceph.com/issues/51311
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
src/pybind/mgr/cephadm/serve.py
src/pybind/mgr/cephadm/services/ingress.py
src/pybind/mgr/cephadm/tests/test_cephadm.py
src/pybind/mgr/orchestrator/__init__.py
src/pybind/mgr/orchestrator/_interface.py