Skip to content

Commit

Permalink
Merge pull request #8099 from marun/dind-ignore-sdn-node
Browse files Browse the repository at this point in the history
Merged by openshift-bot
  • Loading branch information
OpenShift Bot committed Apr 14, 2016
2 parents a5940eb + 7d93bad commit b910941
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions hack/dind-cluster.sh
Expand Up @@ -324,11 +324,12 @@ os::provision::install-cmds ${DEPLOYED_ROOT}"
}

function nodes-are-ready() {
local node_count=$(${DOCKER_CMD} exec -t "${MASTER_NAME}" bash -c "\
# Skip the SDN node since nothing is intended to be scheduled on it.
local node_count=$(${DOCKER_CMD} exec -t "${MASTER_NAME}" bash -c "\
KUBECONFIG=${DEPLOYED_CONFIG_ROOT}/openshift.local.config/master/admin.kubeconfig \
oc get nodes | grep Ready | wc -l")
node_count=$(echo "${node_count}" | tr -d '\r')
test "${node_count}" -ge "${NODE_COUNT}"
oc get nodes | grep -v ${SDN_NODE_NAME} | grep -v NotReady | grep Ready | wc -l")
node_count=$(echo "${node_count}" | tr -d '\r')
test "${node_count}" -ge "${NODE_COUNT}"
}

function wait-for-cluster() {
Expand Down

0 comments on commit b910941

Please sign in to comment.