Merge "Clean up neutron cleanup code"

Zuul · openstack-gerrit · commit 8fa03a37adb7 · 2022-08-23T20:05:48.000Z
diff --git a/lib/neutron b/lib/neutron
@@ -567,7 +567,6 @@ function stop_neutron_new {
     fi
 
     if is_service_enabled neutron-metadata-agent; then
-        sudo pkill -9 -f neutron-ns-metadata-proxy || :
         stop_process neutron-metadata-agent
     fi
 }
diff --git a/lib/neutron-legacy b/lib/neutron-legacy
@@ -628,7 +628,6 @@ function stop_mutnauq_other {
     fi
 
     if is_service_enabled q-meta; then
-        sudo pkill -9 -f neutron-ns-metadata-proxy || :
         stop_process q-meta
     fi
 

Original file line number	Diff line number	Diff line change
`@@ -567,7 +567,6 @@ function stop_neutron_new {`
`567`	`567`	`fi`
`568`	`568`
`569`	`569`	`if is_service_enabled neutron-metadata-agent; then`
`570`		`- sudo pkill -9 -f neutron-ns-metadata-proxy \|\| :`
`571`	`570`	`stop_process neutron-metadata-agent`
`572`	`571`	`fi`
`573`	`572`	`}`