]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #42682 into master
authorSage Weil <sage@newdream.net>
Wed, 11 Aug 2021 14:58:39 +0000 (10:58 -0400)
committerSage Weil <sage@newdream.net>
Wed, 11 Aug 2021 14:58:39 +0000 (10:58 -0400)
commit191f1dc470a1db75d542f8e9b1e0149f7f21f4f1
tree5b5c99f6ec22430fb8525d10ed3cbee033f7faec
parenteb37e5b2e946e11ba31e0692030569cff7643b4b
parent4dc860feef4802d0432c54f3a40584ad7e9138bf
Merge PR #42682 into master

* refs/pull/42682/head:
cephadm: no need to explicitly enable prometheus module
mgr/cephadm: enable prometheus module before deploying prometheus
mgr/cephadm: drop daemon_id arg to CephadmService.config()
doc/cephadm: no need to manually enable the prometheus module

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>