From 5d470357ec6acd7f31a626283be14154968c0798 Mon Sep 17 00:00:00 2001 From: Gregory Thiemonge Date: Thu, 25 Mar 2021 07:45:35 +0100 Subject: [PATCH] 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 --- devstack/plugin.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 9c5511d851..a591215474 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -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 {