From: Michael Fritch Date: Mon, 18 May 2020 21:40:23 +0000 (-0600) Subject: cephadm: don't check port in use during nfs reconfig X-Git-Tag: wip-pdonnell-testing-20200918.022351~1224^2~3 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6f4b5ac9dd4839741e1ceb8d48bf33bd6a5d7793;p=ceph-ci.git cephadm: don't check port in use during nfs reconfig Signed-off-by: Michael Fritch --- diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 6a7c568bd8f..24c25dd8346 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -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()