Be careful of 'set -e'.

This commit is contained in:
Adam Gandelman 2013-03-08 20:19:40 -08:00
parent c37ee1d51f
commit 1d45cd4a58
2 changed files with 8 additions and 4 deletions

@ -351,7 +351,9 @@ EOF
if [ "$NET_MANAGER" == "Quantum" ]; then
# if first time here, config quantum before setting up
# https.
[[ -z "$clustered" ]] && eligible_leader && configure_quantum_networking
if [[ -z "$clustered" ]] && eligible_leader ; then
configure_quantum_networking
fi
# ripple out changes to identity to connected services
# which use cloud-controller as source of information for
# keystone
@ -375,8 +377,10 @@ EOF
# if this changed event happens as a result of clustered VIP
# reconfigure, configure_https needs to update VIP certificate
# before quantumclient is used.
[[ "$NET_MANAGER" == "Quantum" ]] && [[ -n "$clustered" ]] &&
eligible_leader 'res_nova_vip' && configure_quantum_networking
if [[ "$NET_MANAGER" == "Quantum" ]] &&
[[ -n "$clustered" ]] && eligible_leader 'res_nova_vip' ; then
configure_quantum_networking
fi
}
volume_joined() {

@ -1 +1 @@
235
236