Add echo cmd

.gitlab-ci.yml

@@ -43,6 +43,7 @@ prep-deploy:
            export prod_instance_id=$(openstack floating ip show $prod_floating_ip -c port_details -f value | awk -F', ' '{print $2}' | awk -F"'" '{print $2}')
            export prod_volume=$(openstack server show $prod_instance_id -c volumes_attached -f value | awk -F"'" '{print $4}')
            echo "Detaching prod_volume=${prod_volume} from prod_instance_id=${prod_instance_id} and creating a snapshot"
+           echo "prod_FIP=$prod_floating_ip"
            eval $(ssh-agent -s)
            chmod 400 "${SSH_PRIV_KEY}"
            ssh-add "${SSH_PRIV_KEY}"
@@ -61,6 +62,7 @@ prep-deploy:
            echo "Make a copy of prod volume $prod_volume to be used in tf-apply"
            TF_VAR_data_volume="xdmod-prod-vol-$BUILD_DATE"
            openstack volume create --snapshot xdmod-prod-vol-snapshot-$BUILD_DATE --size 150 $TF_VAR_data_volume
+           echo "prod_instance_id=${prod_instance_id}" | tee -a $CI_PROJECT_DIR/vars.env
       else
            echo "Unknown TARGET_ENV: $TARGET_ENV"
            exit 1
@@ -68,9 +70,6 @@ prep-deploy:
       echo "TF_VAR_data_volume=${TF_VAR_data_volume}" | tee -a $CI_PROJECT_DIR/vars.env
       echo "TF_VAR_flavor=${TF_VAR_flavor}" | tee -a $CI_PROJECT_DIR/vars.env
       echo "BUILD_DATE=${BUILD_DATE}" | tee -a $CI_PROJECT_DIR/vars.env
-      echo "prod_instance_id=${prod_instance_id}" | tee -a $CI_PROJECT_DIR/vars.env
-      echo "prod_floating_ip=${prod_floating_ip}" | tee -a $CI_PROJECT_DIR/vars.env
-
   artifacts:
     reports:
       dotenv: vars.env
@@ -159,7 +158,9 @@ production-deploy:
   tags: [build]
   script:
     - echo "swap the floating IP between prod and newly deployed instances"
-    - openstack server remove floating ip $prod_instance_id $prod_floating_ip
+    - echo "openstack server remove floating ip $instance_id $instance_floating_ip"
+    - echo "openstack server remove floating ip ${prod_instance_id} ${prod_floating_ip}"
+    - openstack server remove floating ip ${prod_instance_id} ${prod_floating_ip}
     - openstack server remove floating ip $instance_id $instance_floating_ip
     - openstack server add floating ip $instance_id $prod_floating_ip
   needs: