From 5f5129e08b032f9542d29cafc94b7b211631af74 Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Wed, 2 Oct 2024 11:14:54 -0500
Subject: [PATCH] capture PROXY_INSTANCE_ID directly from server creation
 output

- Updated deploy_ood_proxy_node script to retrieve PROXY_INSTANCE_ID directly using `openstack server create` with `--format value --column id`
- Added debug logging to output the created instance ID
- Simplified instance creation and floating IP assignment process
---
 .gitlab-ci.yml | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90b3d43..2ffab27 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,7 @@ workflow:
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
     - if: $CI_PIPELINE_SOURCE == 'schedule'
-  
+
 deploy_ood_proxy_node:
   stage: deploy
   environment:
@@ -51,13 +51,22 @@ deploy_ood_proxy_node:
     - build
   script:
     - |
-      openstack server create \
+      PROXY_INSTANCE_ID=$(openstack server create \
         --image $PKR_VAR_source_image \
         --flavor $PKR_VAR_flavor \
         --network $OOD_INSTANCE_NETWORK \
         --wait \
-        $OOD_PROXY_NAME
-    - PROXY_INSTANCE_ID=$(openstack server show -f value -c id $OOD_PROXY_NAME)
-    - openstack server add floating ip $OOD_PROXY_NAME $PROXY_IP
-    - echo "PROXY_INSTANCE_ID=$PROXY_INSTANCE_ID" >> $CI_PROJECT_DIR/variables.env
-      
\ No newline at end of file
+        --format value \
+        --column id \
+        $OOD_PROXY_NAME)
+      
+      # Log the created instance ID for debugging
+      echo "Created PROXY_INSTANCE_ID: $PROXY_INSTANCE_ID"
+
+      # Add a floating IP to the created server
+      openstack server add floating ip $OOD_PROXY_NAME $PROXY_IP
+
+      # Store the instance ID in variables.env for later use
+      echo "PROXY_INSTANCE_ID=$PROXY_INSTANCE_ID" >> $CI_PROJECT_DIR/variables.env
+  rules:
+   when: manual
-- 
GitLab