From 31d8aaed39c780ba31295f591d01f13ff1f9fad9 Mon Sep 17 00:00:00 2001 From: donggyu_park Date: Mon, 22 Feb 2021 16:52:50 +0900 Subject: [PATCH] cephadm: Delete the unnecessary error line in open_ports In #39020, d9fbd7e is cherry picked from 70722a2. there is no bug in 70722a2, but there is a bug in d9fbd7e. It seems that the unnecessary error line was added during cherry picking. So error only occurs in octopus branch. This commit directly fixes issue in octopus branch instead of cherry picking since cherry picking from 70722a2 has already been applied to octopus branch. This commit deletes the unnecessary error line added in d9fbd7e. In d9fbd7e, the parameter verbose_on_failure was removed in call. However, the unnecessary line that uses verbose_on_failure was added in open_ports and so error occurs. Fixes: https://tracker.ceph.com/issues/49467 Signed-off-by: Donggyu Park --- src/cephadm/cephadm | 1 - 1 file changed, 1 deletion(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 8de809d75bf..4e9f5ff6fe3 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -2381,7 +2381,6 @@ class Firewalld(object): else: logger.debug('firewalld port %s is enabled in current zone' % tcp_port) - out, err, ret = call([self.cmd, '--permanent', '--query-port', tcp_port], verbose_on_failure=False) def apply_rules(self): # type: () -> None if not self.available: -- 2.47.3