openstack/devstack
Code Issues Proposed changes

Don't use --skip-redirect for cinder restart on rhel6

Browse Source 
RHEL6 doesn't support this flag so the restart fails.  Not exactly
sure why it is required, seems unchagned from the initial
commit 67787e6b4c

(found running stack.sh with -e per [1])

[1] https://review.openstack.org/#/c/71996/

Change-Id: Ib34c3663409d7b96b932286cb5a6974e940075d3
This commit is contained in:
Ian Wienand 2014-02-26 14:52:02 +11:00
parent e26b7bb415
commit 3b57829ece
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/cinder
View File

@ -496,8 +496,12 @@ function start_cinder() {
sudo stop tgt || true sudo stop tgt || true
sudo start tgt sudo start tgt
elif is_fedora; then elif is_fedora; then
# bypass redirection to systemctl during restart if [[ $DISTRO =~ (rhel6) ]]; then
sudo /sbin/service --skip-redirect tgtd restart sudo /sbin/service tgtd restart
else
# bypass redirection to systemctl during restart
sudo /sbin/service --skip-redirect tgtd restart
fi
elif is_suse; then elif is_suse; then
restart_service tgtd restart_service tgtd
else else