]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr/cephadm: Fix haproxy not being recognized as a proper daemon
authorSebastian Wagner <sewagner@redhat.com>
Wed, 21 Jul 2021 08:45:51 +0000 (10:45 +0200)
committerSebastian Wagner <sewagner@redhat.com>
Tue, 10 Aug 2021 14:32:13 +0000 (16:32 +0200)
commitd5693e689037c0fa0154fcf93040dbe5dba7477a
tree72feacd29b8d6bdc007fb2dd0bc266c72a52c5fd
parenta1fcefa17d2a7dca5e50080416f9e58984d65efc
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>
(cherry picked from commit a8f1cf2edb0ef5b48632af8da9577c8a42a6ff60)
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