ceph: revert new node is not provisioned when useallnodes is true

This reverts commit a6ee5657ae.
The operator reconcile of the cephcluster was staying in an endless
loop in clusters that did not have OSDs configured on all nodes.
Now we revert this change for the patch release and will follow
up with a more complete fix in https://github.com/rook/rook/pull/6813.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
This commit is contained in:
Travis Nielsen committed 2020-12-16 11:36:31 -07:00
1 parent 1ede13425f
commit 64fc740d8a
1 file changed
-6
-6
View File
@@ -22,12 +22,10 @@ import (
"io/ioutil"
"strconv"
"strings"
"syscall"
"github.com/pkg/errors"
cephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1"
"github.com/rook/rook/pkg/clusterd"
"github.com/rook/rook/pkg/util/exec"
)
const (
@@ -204,10 +202,6 @@ func GetOSDOnHost(context *clusterd.Context, clusterInfo *ClusterInfo, node stri
args := []string{"osd", "crush", "ls", node}
buf, err := NewCephCommand(context, clusterInfo, args).Run()
if err != nil {
// ENOENT as error means that node is not (yet) part of the ceph cluster
if code, ok := exec.ExitStatus(err); ok && code == int(syscall.ENOENT) {
return "", nil
}
return "", errors.Wrapf(err, "failed to get osd list on host. %s", string(buf))
}