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

2014-03-05 14:21:10 +00:00 · 2014-03-05 14:21:10 +00:00 · 4981bd7532
commit 4981bd7532
parent b9a7035081 d5b52ca755
1 changed files with 1 additions and 4 deletions
--- a/lib/cinder
+++ b/lib/cinder
@ -491,10 +491,7 @@ function start_cinder {
        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