From a7776019a65a32f9c379fb466144a243426067d9 Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Wed, 2 Oct 2024 11:23:13 -0500
Subject: [PATCH] correct floating IP column name and use instance ID for
assignment
- Fixed the floating IP column name to 'Floating IP Address' in `openstack floating ip list`
---
.gitlab-ci.yml | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 086851b..b87a319 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,20 +68,21 @@ deploy_ood_proxy_node:
exit 1
fi
- # Check if the floating IP is available
- FLOATING_IP=$(openstack floating ip list --format value --column Floating_IP_Address | grep -w "$PROXY_IP")
+ # Get the available floating IP and ensure it's valid
+ FLOATING_IP=$(openstack floating ip list --format value --column 'Floating IP Address' | grep -w "$PROXY_IP")
if [ -z "$FLOATING_IP" ]; then
echo "ERROR: No Floating IP found for ${PROXY_IP}"
exit 1
else
- # Add the floating IP to the created server
- openstack server add floating ip $OOD_PROXY_NAME $PROXY_IP
- echo "Successfully assigned Floating IP: $PROXY_IP to the server"
+ # Add the floating IP to the newly created instance
+ openstack server add floating ip $NEW_INSTANCE_ID $FLOATING_IP
+ echo "Successfully assigned Floating IP: $FLOATING_IP to the server"
fi
# Store the instance ID in variables.env for later use
- echo "PROXY_INSTANCE_ID=$PROXY_INSTANCE_ID" >> $CI_PROJECT_DIR/variables.env
+ echo "NEW_INSTANCE_ID=$NEW_INSTANCE_ID" >> $CI_PROJECT_DIR/variables.env
+
rules:
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
- if: $CI_PIPELINE_SOURCE == 'schedule'
--
GitLab