diff --git a/devstack/lib/cephadm b/devstack/lib/cephadm index 43127d5b..dbde155a 100755 --- a/devstack/lib/cephadm +++ b/devstack/lib/cephadm @@ -78,6 +78,7 @@ CEPHFS_CLIENT=0 CEPHFS_CLIENT_NAME="client.$MANILA_CEPH_USER" CEPHFS_CLIENT_LOG="/var/log/ceph-$CEPHFS_CLIENT_NAME.log" CEPHFS_MULTIPLE_FILESYSTEMS=${CEPHFS_MULTIPLE_FILESYSTEMS:-False} +ENABLE_INGRESS=${ENABLE_INGRESS:-True} VIP=${CEPH_INGRESS_IP:-$HOST_IP} @@ -368,7 +369,7 @@ function _install_and_configure_clustered_nfs { ceph_version=$(_get_ceph_version) echo "[CEPHADM] Deploy nfs.$FSNAME backend" - if [ "${ceph_version%%\.*}" -ge 18 ]; then + if [[ "${ceph_version%%\.*}" -ge 18 && $ENABLE_INGRESS == "True" ]]; then $SUDO "$CEPHADM" shell --fsid $FSID --config $CEPH_CONFIG \ --keyring $CEPH_KEYRING -- ceph nfs cluster create \ "$FSNAME" "$HOSTNAME" --port $NFS_PORT --ingress \