Merge "Fix devstack cleanup when using amphorav2" into stable/victoria
This commit is contained in:
commit
5ff5d729d2
|
@ -258,6 +258,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
|
||||||
|
@ -266,9 +270,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 {
|
||||||
|
@ -658,6 +659,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 {
|
||||||
|
|
Loading…
Reference in New Issue