openstack
/
octavia
Code Issues Proposed changes

Fix devstack cleanup when using amphorav2 

When cleaning up a devstack environment with amphorav2 enabled,
./clean.sh might fail because redis has already been stopped and
uninstalled.
This commit move the stop_redis step to the octavia_stop step and
ensures that stopping redis doesn't fail.

Change-Id: I987535e90cbf13917c50c5905c64b614188928ec
(cherry picked from commit 5d470357ec)
This commit is contained in:
Gregory Thiemonge 2021-03-25 07:45:35 +01:00 committed by Carlos Goncalves
parent 46979a0d1b
commit 168f1a1212
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 { function uninstall_redis {
if is_fedora; then if is_fedora; then
uninstall_package redis uninstall_package redis
@ -272,9 +276,6 @@ function uninstall_redis {
elif is_suse; then elif is_suse; then
uninstall_package redis uninstall_package redis
fi fi
stop_service redis
} }
function octavia_configure { function octavia_configure {
@ -663,6 +664,10 @@ function octavia_stop {
else else
die "Unknown network controller. Please define octavia_delete_network_interface_device" die "Unknown network controller. Please define octavia_delete_network_interface_device"
fi fi
if [[ ${OCTAVIA_ENABLE_AMPHORAV2_JOBBOARD} == True ]]; then
stop_redis
fi
} }
function octavia_cleanup { function octavia_cleanup {