openstack/kolla-ansible
Code Issues Proposed changes

Exit on failure in init-runonce

Browse Source 
Previously we sourced this script in tests/deploy.sh, but this was
recently changed. Following that change we lost the errexit setting,
meaning we ignore errors in init-runonce.

Adding errexit in the script itself means that all callers get error
handling.

Also log init-runonce output.

TrivialFix

Change-Id: I9b35bd5f0f76eec26ddd968d093a3a5fd55a7ce2
This commit is contained in:
Mark Goddard 2019-06-28 12:32:52 +01:00
parent 54856a873f
commit bc08b44fd1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/deploy.sh
View File

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

4
tools/init-runonce
View File

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