add some messages to the rollback job

.gitlab-ci.yml

@@ -138,15 +138,15 @@ cleanup-failed-full-deployment:
       REMOVE_ID=`openstack server show $TESTING_NAME -f value -c id`;
       openstack server set --name $TESTING_NAME $OLD_TEST_ID;
       openstack server add floating ip $OLD_TEST_ID $TESTING_IP;
-      openstack server delete $REMOVE_ID && echo "Deleted old testing server.";
+      openstack server delete $REMOVE_ID && echo "Deleted faulty testing server.";
       fi
     # if applicable, rollback prod server
     - if [ "$rollback_prod" = true ] ; then 
-      REMOVE_ID=`openstack server show $PRODUCTION_NAME -f value -c id`;
+      REMOVE_ID=`openstack server show $PRODUCTION_NAME -f value -c id` || "No new production server found.";
       openstack server set --name $PRODUCTION_NAME $OLD_PROD_ID;
       openstack server add floating ip $OLD_PROD_ID $PRODUCTION_IP;
-      openstack server remove volume $REMOVE_ID $VOLUME_ID;
-      openstack server delete $REMOVE_ID && echo "Deleted old testing server.";
+      openstack server remove volume $REMOVE_ID $VOLUME_ID || "No Volume was removed.";
+      openstack server delete $REMOVE_ID && echo "Deleted faulty production server." || "No faulty production was deleted.";
       openstack server add volume $OLD_PROD_ID $VOLUME_ID;
       ssh -oStrictHostKeyChecking=accept-new apiserver@$PRODUCTION_DOMAIN "mount /dev/vdb1 /app/mnt";
       fi