From 7fc6e7f6bec33156726964a1c091efbe013bfbbb Mon Sep 17 00:00:00 2001
From: Sergii Kipot <skipot@sipwise.com>
Date: Wed, 25 Jul 2018 11:18:09 +0200
Subject: [PATCH] Revert "TT#37113 Fix column to check status of instance"
If ip is assigned later ip field in ec2-describe-instances output
is not stable and sometimes it's shown as automatically assigned
one (for instance ip-10-101-136-154.eu-west-1.compute.internal)
(status is in field 6 then) and sometimes it's just empty
(status is in field 5 then). So it looks that having ip assigned
on earlier stage(like it was) makes sense and does
ec2-describe-instances output stable under all circumstances.
So reverting the change here.
This reverts commit 97b7d218e7454c38b3802f6acccaf6ae51e03308.
Change-Id: I26bc165ddfe7c93d9bbaee0ad80811f77af89d6a
---
ec2-create-ce | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ec2-create-ce b/ec2-create-ce
index 51f7ece..006acc2 100755
--- a/ec2-create-ce
+++ b/ec2-create-ce
@@ -411,12 +411,12 @@ ec2-create-tags --region "$AWS_REGION" "$INSTANCE_ID" --tag Purpose="$TAG_PURPOS
# assign name (useful for web management console browsing)
ec2-create-tags --region "$AWS_REGION" "$INSTANCE_ID" --tag Name="${AMI_NAME}/${DATE_STRING}/${JOB_NAME}/build_${BUILD_NUMBER}"
-STATUS="$(ec2-describe-instances --region ${AWS_REGION} --filter instance-id="$INSTANCE_ID" | awk '/INSTANCE/ {print $5}')"
+STATUS="$(ec2-describe-instances --region ${AWS_REGION} --filter instance-id="$INSTANCE_ID" | awk '/INSTANCE/ {print $6}')"
echo "Starting instance ID $INSTANCE_ID for ngcp version $NGCP_VERSION"
retry=120 # up to 10 minutes
while [ "$STATUS" != "running" ] && [ $retry -ne 0 ] ; do
- STATUS="$(ec2-describe-instances --region ${AWS_REGION} --filter instance-id="$INSTANCE_ID" | awk '/INSTANCE/ {print $5}')"
+ STATUS="$(ec2-describe-instances --region ${AWS_REGION} --filter instance-id="$INSTANCE_ID" | awk '/INSTANCE/ {print $6}')"
retry=$((retry - 1))
echo "Instance ID $INSTANCE_ID not running yet, checking again in 5 seconds ($retry retries left)."
sleep 5