Merge "Exit on failure in init-runonce" into stable/stein

tests/deploy.sh

@@ -28,7 +28,7 @@ function deploy {
 
     if ! openstack image show cirros >/dev/null 2>&1; then
         echo "Initialising OpenStack resources via init-runonce"
-        tools/init-runonce
+        tools/init-runonce &> /tmp/logs/ansible/init-runonce
     else
         echo "Not running init-runonce - resources exist"
     fi

tools/init-runonce

@@ -1,5 +1,7 @@
 #!/bin/bash
-#
+
+set -o errexit
+
 # This script is meant to be run once after running start for the first
 # time.  This script downloads a cirros image and registers it.  Then it
 # configures networking and nova quotas to allow 40 m1.small instances