openstack
/
octavia
Code Issues Proposed changes

Merge "Fix devstack cleanup when using amphorav2"

This commit is contained in:
Zuul 2021-04-01 08:18:06 +00:00 committed by Gerrit Code Review
parent f769c2b42d 5d470357ec
commit fa08122b18
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devstack/plugin.sh
View File

@ -264,6 +264,10 @@ function install_redis {
}
function stop_redis {
stop_service redis || true
}
function uninstall_redis {
if is_fedora; then
uninstall_package redis
@ -272,9 +276,6 @@ function uninstall_redis {
elif is_suse; then
uninstall_package redis
fi
stop_service redis
}
function octavia_configure {
@ -663,6 +664,10 @@ function octavia_stop {
else
die "Unknown network controller. Please define octavia_delete_network_interface_device"
fi
if [[ ${OCTAVIA_ENABLE_AMPHORAV2_JOBBOARD} == True ]]; then
stop_redis
fi
}
function octavia_cleanup {