Remove references to staging in production-deploy job

.gitlab-ci.yml

@@ -140,20 +140,20 @@ production-deploy:
     - openstack server remove volume $prod_instance_id $prod_volume
     - openstack server stop $prod_instance_id
 
-    - export staging_volume=$(openstack server show $instance_id -c volumes_attached -f value | awk -F"'" '{print $4}')
-    - echo "Detaching staging_volume_id=${staging_volume} from staging_instance_id=${instance_id}"
-    - ssh -o StrictHostKeyChecking=no $SSH_USERNAME@$staging_floating_ip sudo systemctl stop mariadb
-    - ssh -o StrictHostKeyChecking=no $SSH_USERNAME@$staging_floating_ip sudo umount /var/lib/mysql && df -h
-    - openstack server remove volume $instance_id $staging_volume
+    - export instance_volume=$(openstack server show $instance_id -c volumes_attached -f value | awk -F"'" '{print $4}')
+    - echo "Detaching instance_volume_id=${instance_volume} from new instance=${instance_id}"
+    - ssh -o StrictHostKeyChecking=no $SSH_USERNAME@$instance_floating_ip sudo systemctl stop mariadb
+    - ssh -o StrictHostKeyChecking=no $SSH_USERNAME@$instance_floating_ip sudo umount /var/lib/mysql && df -h
+    - openstack server remove volume $instance_id $instance_volume
 
-    - echo "Attach prod volume $xdmod-prod-vol-$BUILD_DATE to staging instance $instance_id"
+    - echo "Attach prod volume $xdmod-prod-vol-$BUILD_DATE to newly deployed instance $instance_id"
     - openstack volume snapshot create --volume $prod_volume xdmod-prod-data-vol-snapshot-$BUILD_DATE
     - openstack volume create --snapshot xdmod-prod-data-vol-snapshot-$BUILD_DATE --size 150 xdmod-prod-vol-$BUILD_DATE
     - openstack server add volume $instance_id xdmod-prod-vol-$BUILD_DATE --device /dev/vdb
 
-    - echo "swap the floating IP between prod and staging instances"
+    - echo "swap the floating IP between prod and newly deployed instances"
     - openstack server remove floating ip $prod_instance_id $prod_floating_ip
-    - openstack server remove floating ip $instance_id $staging_floating_ip
+    - openstack server remove floating ip $instance_id $instance_floating_ip
     - openstack server add floating ip $instance_id $prod_floating_ip
 
     - ssh -o StrictHostKeyChecking=no $SSH_USERNAME@$prod_floating_ip sudo mount /dev/vdb1 /var/lib/mysql