diff --git a/tools/deploy_aio.sh b/tools/deploy_aio.sh
index 7faad99b46..0b80c6ccfe 100755
--- a/tools/deploy_aio.sh
+++ b/tools/deploy_aio.sh
@@ -19,6 +19,8 @@ function check_failure {
     fi
 }
 
+trap check_failure EXIT
+
 # Populate globals.yml
 cat << EOF > /etc/kolla/globals.yml
 ---
@@ -36,6 +38,4 @@ ip l a fake_interface type dummy
 # Actually do the deployment
 tools/kolla-ansible -vvv deploy
 
-check_failure
-
 # TODO(SamYaple): Actually do functional testing of OpenStack