commit 4981bd75322810b5ad5bfc89ba77f6e8fb0733e8
author Jenkins <jenkins@review.openstack.org> Wed Mar 05 14:21:10 2014 +0000
committer Gerrit Code Review <review@openstack.org> Wed Mar 05 14:21:10 2014 +0000
tree 4da028b1c4eefcadeff8ace649f192eaf09e35d8
parent b9a7035081b6a897254f2510b88813f47cbca20b
parent d5b52ca7557ec1aef71f21c71110455a6aea2505

Merge "fix tgt to use 'service' instead of upstart calls"

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index d003f5d..dd2956a 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -491,10 +491,7 @@
         sudo rm -f /etc/tgt/conf.d/stack.conf
         _configure_tgt_for_config_d
         if is_ubuntu; then
-            # tgt in oneiric doesn't restart properly if tgtd isn't running
-            # do it in two steps
-            sudo stop tgt || true
-            sudo start tgt
+            sudo service tgt restart
         elif is_fedora; then
             if [[ $DISTRO =~ (rhel6) ]]; then
                 sudo /sbin/service tgtd restart