openstack/octavia
Code Issues Proposed changes

Fix error on devstack cleanup

Browse Source 
Change I7ebf4137feb04827490dffc0dac3d6e4c8888075 added 'set -e' in
devstack/plugin.sh, but on devstack cleanup, some commands may fail
because of non-working services (i.e after a reboot).
This commit allows 'openstack keypair delete' to fail on clean up.

Change-Id: Ic782faba3eb907d29b6735ac0a6d6a8a2e104e00
This commit is contained in:
Gregory Thiemonge 2020-06-15 08:43:03 +02:00
parent aee9cd6fe4
commit c176cf60d4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/plugin.sh
View File

@ -654,7 +654,7 @@ function octavia_cleanup {
fi
if [ $OCTAVIA_NODE == 'main' ] || [ $OCTAVIA_NODE == 'standalone' ] ; then
if [ ${OCTAVIA_AMP_SSH_KEY_NAME}x != x ] ; then
openstack keypair delete ${OCTAVIA_AMP_SSH_KEY_NAME}
openstack keypair delete ${OCTAVIA_AMP_SSH_KEY_NAME} || true
fi
fi
if [[ "$OCTAVIA_USE_MOD_WSGI" == "True" ]]; then