From: Sage Weil <sage@redhat.com>
Date: Fri, 6 Dec 2019 20:20:07 +0000 (-0600)
Subject: ceph-daemon: fix firewalld error case
X-Git-Tag: v15.1.0~625^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=474309804b7444b9a6412959678366aaa4e065c5;p=ceph.git

ceph-daemon: fix firewalld error case

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/ceph-daemon/ceph-daemon b/src/ceph-daemon/ceph-daemon
index 7edfccc4632b..62ac6df1a8aa 100755
--- a/src/ceph-daemon/ceph-daemon
+++ b/src/ceph-daemon/ceph-daemon
@@ -694,8 +694,8 @@ def update_firewalld(daemon_type):
             logger.info('Enabling firewalld service %s in current zone...' % svc)
             out, err, ret = call([cmd, '--permanent', '--add-service', svc])
             if ret:
-                raise RuntimeError('unable to add service %s to current zone:' %
-                                   (svc, err))
+                raise RuntimeError(
+                    'unable to add service %s to current zone: %s' % (svc, err))
         else:
             logger.debug('firewalld service %s is enabled in current zone' % svc)
     for port in fw_ports: