- Autodated namespace for AlarmSets for ASG

waterbear-cloud · Nov 23, 2021 · b4714e5 · b4714e5
1 parent 9b794e9
commit b4714e5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/paco/application/ec2_launch_manager.py b/src/paco/application/ec2_launch_manager.py
@@ -1104,7 +1104,7 @@ def lb_add_ebs(self, bundle_name, resource):
 
     aws ec2 attach-volume --region $REGION --volume-id $EBS_VOLUME_ID --instance-id $INSTANCE_ID --device $EBS_DEVICE 2>/tmp/ec2lm_attach.output
     RES=$?
-    if [ $? -eq 0 ] ; then
+    if [ $RES -eq 0 ] ; then
         echo "EC2LM: EBS: Successfully attached $EBS_VOLUME_ID to $INSTANCE_ID as $EBS_DEVICE"
         return 0
     fi
@@ -1213,8 +1213,8 @@ def lb_add_ebs(self, bundle_name, resource):
     fi
 
     # Initialize filesystem if blank
-    echo "EC2LM: EBS: Waiting for volume to become available: $EBS_VOLUMEID on $EBS_DEVICE"
-    TIMEOUT_SECS=30
+    echo "EC2LM: EBS: Waiting for volume to become available: $EBS_VOLUME_ID on $EBS_DEVICE"
+    TIMEOUT_SECS=120
     OUTPUT=$(ec2lm_timeout $TIMEOUT_SECS ec2lm_volume_is_attached $EBS_VOLUME_ID $EBS_DEVICE)
     if [ $? -eq 1 ] ; then
         echo "EC2LM: EBS: Error: Unable to detect the attached volume $EBS_VOLUME_ID to $INSTANCE_ID as $EBS_DEVICE."