Merge "Kill radvd when stopping neutron-l3 service"

2016-02-19 10:26:50 +00:00
parent ef0129c7ce a15d9de92f
commit 134e1d36c6
1 changed files with 5 additions and 1 deletions
--- a/lib/neutron-legacy
+++ b/lib/neutron-legacy
@@ -772,7 +772,11 @@ function stop_neutron_other {
    fi

    stop_process q-svc
-    stop_process q-l3
+
+    if is_service_enabled q-l3; then
+        sudo pkill -f "radvd -C $DATA_DIR/neutron/ra"
+        stop_process q-l3
+    fi

    if is_service_enabled q-meta; then
        sudo pkill -9 -f neutron-ns-metadata-proxy || :