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
This commit is contained in:
parent
c4c5c0b82a
commit
5d470357ec
|
@ -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 {
|
||||
|
|
Loading…
Reference in New Issue