diff --git a/modules/openstack_project/templates/run_remote_puppet.sh.erb b/modules/openstack_project/templates/run_remote_puppet.sh.erb
index ad9334a43c..1dcf998c71 100755
--- a/modules/openstack_project/templates/run_remote_puppet.sh.erb
+++ b/modules/openstack_project/templates/run_remote_puppet.sh.erb
@@ -51,7 +51,9 @@ cd /opt/config/production
 
 # Run things that need to be ordered
 for host in $OVERRIDE_LIST; do
-    if run_ssh $host ; then
+    run_ssh $host
+    ret=$?
+    if [ $ret != 0 ] ; then
         break
     fi
 done