Skip to content

Commit

Permalink
Remove direct access to node via ssh in sriov script
Browse files Browse the repository at this point in the history
Signed-off-by: Zenghui Shi <zshi@redhat.com>
  • Loading branch information
zshi-redhat committed Feb 3, 2021
1 parent 3dc1065 commit 0730d4d
Showing 1 changed file with 2 additions and 33 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/bin/bash

SRIOV_NAMESPACE=${SRIOV_NAMESPACE:-"openshift-sriov-network-operator"}
SSH_OPTS='-o StrictHostKeyChecking=no -o PasswordAuthentication=no'

# echoes the command provided as $@ and then runs it
echo_and_eval () {
Expand All @@ -27,25 +26,6 @@ try_eval () {
return $status
}

run_self_via_ssh () {
args=$1
host=$2

if ! try_eval ssh $SSH_OPTS core@$host /bin/true; then
return 1
fi

if ! try_eval ssh $SSH_OPTS core@$host mkdir -m 0700 -p $logdir; then
return 1
fi

if ! try_eval scp -pr $SSH_OPTS $logdir/meta core@$host:$logdir; then
return 1
fi

ssh $SSH_OPTS core@$host $extra_env /bin/bash $logdir/meta/debug.sh $args
}

do_operator () {
while read node addr; do
stat=$(oc get sriovnetworknodestate $node -n $SRIOV_NAMESPACE --template '{{.status.syncStatus}}' 2>/dev/null)
Expand All @@ -63,6 +43,7 @@ do_operator () {
done < $logdir/meta/nodeinfo
}

# TODO: collect node info with debug pod
do_node () {
while read node addr; do
if ip addr show | grep -q "inet $addr/"; then
Expand Down Expand Up @@ -141,12 +122,8 @@ do_operator_and_nodes () {
do_operator

printf "\n"
printf "Analyzing nodes\n"
printf "TODO: Analyzing nodes\n"

while read node addr; do
run_self_via_ssh --node $addr < /dev/null && \
try_eval scp $SSH_OPTS -pr core@$addr:$logdir/nodes $logdir
done < $logdir/meta/nodeinfo
}

case "$0" in
Expand All @@ -158,14 +135,6 @@ case "$0" in
;;
esac

case "$1" in
--node)
logdir=$(dirname $0 | sed -e 's|/meta$||')
do_node
exit 0
;;
esac

logdir=$(mktemp --tmpdir -d openshift-sriov-debug-XXXXXXXXX)
echo $logdir
mkdir $logdir/meta
Expand Down

0 comments on commit 0730d4d

Please sign in to comment.