Browse Source

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)
(cherry picked from commit 168f1a1212)
changes/52/791652/1
Gregory Thiemonge 4 months ago
committed by Carlos Goncalves
parent
commit
5d49484eb6
  1. 11
      devstack/plugin.sh

11
devstack/plugin.sh

@ -258,6 +258,10 @@ function install_redis {
}
function stop_redis {
stop_service redis || true
}
function uninstall_redis {
if is_fedora; then
uninstall_package redis
@ -266,9 +270,6 @@ function uninstall_redis {
elif is_suse; then
uninstall_package redis
fi
stop_service redis
}
function octavia_configure {
@ -658,6 +659,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…
Cancel
Save