@@ -1476,6 +1476,12 @@ function stop_process {

         # Kill via pid if we have one available

         if [[ -r $SERVICE_DIR/$SCREEN_NAME/$service.pid ]]; then

             pkill -g $(cat $SERVICE_DIR/$SCREEN_NAME/$service.pid)

+            # TODO(danms): Remove this double-kill when we have

+            # this fixed in all services:

+            # https://bugs.launchpad.net/oslo-incubator/+bug/1446583

+            sleep 1

+            # /bin/true becakse pkill on a non existant process returns an error

+            pkill -g $(cat $SERVICE_DIR/$SCREEN_NAME/$service.pid) || /bin/true

             rm $SERVICE_DIR/$SCREEN_NAME/$service.pid

         fi

         if [[ "$USE_SCREEN" = "True" ]]; then