]> git.apps.os.sepia.ceph.com Git - ceph-ci.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)
committerMichael Fritch <mfritch@suse.com>
Mon, 18 May 2020 23:27:59 +0000 (17:27 -0600)
Signed-off-by: Michael Fritch <mfritch@suse.com>
src/cephadm/cephadm

index 6a7c568bd8f6e19ffac8de52d85dc2a1b8f56e18..24c25dd83467ebea92c189d856aa2653040f566a 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()