]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: don't check port in use during nfs reconfig
authorMichael Fritch <mfritch@suse.com>
Mon, 18 May 2020 21:40:23 +0000 (15:40 -0600)
committerSebastian Wagner <sebastian.wagner@suse.com>
Thu, 21 May 2020 21:33:18 +0000 (23:33 +0200)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 6f4b5ac9dd4839741e1ceb8d48bf33bd6a5d7793)

src/cephadm/cephadm

index f0d4524601079e61a5e13f128aca907bb469a651..64289b46f0ed4a1c3a82488efbd7cf5c5c257f31 100755 (executable)
@@ -2724,7 +2724,8 @@ def command_deploy():
                       reconfig=args.reconfig)
 
     elif daemon_type == NFSGanesha.daemon_type:
-        NFSGanesha.port_in_use()
+        if not args.reconfig:
+            NFSGanesha.port_in_use()
         (config, keyring) = get_config_and_keyring()
         # TODO: extract ganesha uid/gid (997, 994) ?
         (uid, gid) = extract_uid_gid()
@@ -2732,6 +2733,7 @@ def command_deploy():
         deploy_daemon(args.fsid, daemon_type, daemon_id, c, uid, gid,
                       config=config, keyring=keyring,
                       reconfig=args.reconfig)
+
     elif daemon_type == CephIscsi.daemon_type:
         (config, keyring) = get_config_and_keyring()
         (uid, gid) = extract_uid_gid()