Skip to content

Commit bda2ad5

Browse files
committed
mgr/prometheus: removing call the verify_tls_files
Removing the call to verify_tls_files as in this case case certs files are generated by cephadm internally and we can trust them. In the worst case (bad files) the prometheus module will fail to start. Fixes: https://tracker.ceph.com/issues/71599 Signed-off-by: Redouane Kachach <[email protected]>
1 parent 9f554ee commit bda2ad5

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

src/pybind/mgr/prometheus/module.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1790,7 +1790,6 @@ def setup_default_config(self, server_addr: str, server_port: int) -> None:
17901790
port=server_port, path='/'))
17911791

17921792
def setup_tls_using_cephadm(self, server_addr: str, server_port: int) -> None:
1793-
from mgr_util import verify_tls_files
17941793
cmd = {'prefix': 'orch certmgr generate-certificates',
17951794
'module_name': 'prometheus',
17961795
'format': 'json'}
@@ -1810,7 +1809,6 @@ def setup_tls_using_cephadm(self, server_addr: str, server_port: int) -> None:
18101809
self.key_file.write(cert_key['key'].encode('utf-8'))
18111810
self.key_file.flush() # pkey_tmp must not be gc'ed
18121811

1813-
verify_tls_files(self.cert_file.name, self.key_file.name)
18141812
cert_file_path, key_file_path = self.cert_file.name, self.key_file.name
18151813

18161814
cherrypy.config.update({

0 commit comments

Comments
 (0)