From ea4e58256784c24b90d736a2c7f1d43a404362cd Mon Sep 17 00:00:00 2001
From: David Vallee Delisle <dvd@redhat.com>
Date: Thu, 10 May 2018 09:24:21 -0400
Subject: [PATCH] Add a 60 seconds timeout to ping_metadata_ip()
Change-Id: I1e476093a16848a4fd702eb8efacc420b6c2255a
Closes-Bug: #1735849
---
network/scripts/run-os-net-config.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/network/scripts/run-os-net-config.sh b/network/scripts/run-os-net-config.sh
index cc3d2b04be..d78240029c 100755
--- a/network/scripts/run-os-net-config.sh
+++ b/network/scripts/run-os-net-config.sh
@@ -38,6 +38,7 @@ function is_local_ip() {
function ping_metadata_ip() {
local METADATA_IP=$(get_metadata_ip)
+ local METADATA_IP_PING_TIMEOUT=60
if [ -n "$METADATA_IP" ] && ! is_local_ip $METADATA_IP; then
@@ -46,7 +47,8 @@ function ping_metadata_ip() {
local COUNT=0
until ping -c 1 $METADATA_IP &> /dev/null; do
COUNT=$(( $COUNT + 1 ))
- if [ $COUNT -eq 10 ]; then
+ sleep 1
+ if [ $COUNT -eq $METADATA_IP_PING_TIMEOUT ]; then
echo "FAILURE"
echo "$METADATA_IP is not pingable." >&2
exit 1