openstack
/
octavia
Code Issues Proposed changes

Merge "Fix error on devstack cleanup"

This commit is contained in:
Zuul 2020-06-26 21:38:42 +00:00 committed by Gerrit Code Review
parent 40731e572f c176cf60d4
commit f399bd83c2
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