]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr/cephadm: introducing orch apply daemon promtail
authorAvan Thakkar <athakkar@redhat.com>
Tue, 25 Jan 2022 18:56:20 +0000 (00:26 +0530)
committerAdam King <adking@redhat.com>
Tue, 3 May 2022 00:48:34 +0000 (20:48 -0400)
commit55414caa6be4df45fb0577af783611358fff1a69
tree87ac6f2831603320ce39fbf1b6a2648bdbdbd6d1
parentdbe8d0716c5602748a09f5c6b5257b91982ab10d
 mgr/cephadm: introducing orch apply daemon promtail

Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Co-authored-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit b576d95f8cf288cb9ca242375a99b6bc460ecb8b)

Conflicts:
src/cephadm/cephadm
src/cephadm/cephadm
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/services/monitoring.py
src/pybind/mgr/cephadm/templates/services/promtail.yml.j2
src/pybind/mgr/orchestrator/_interface.py
src/pybind/mgr/orchestrator/module.py
src/python-common/ceph/deployment/service_spec.py