openstack
/
devstack
Code Issues Proposed changes

Merge "On Ubuntu: don't start Zookeeper twice"

This commit is contained in:
Jenkins 2015-11-11 13:32:02 +00:00 committed by Gerrit Code Review
parent 2e17de1705 04e73e17e8
commit db6cb078ae
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/zookeeper
View File

@ -69,7 +69,12 @@ function install_zookeeper {
# start_zookeeper() - Start running processes, including screen
function start_zookeeper {
start_service zookeeper
# Starting twice Zookeeper on Ubuntu exits with error code 1. See LP#1513741
# Match both systemd and sysvinit output
local running="(active \(running\)|start/running)"
if ! is_ubuntu || ! sudo /usr/sbin/service zookeeper status | egrep -q "$running"; then
start_service zookeeper
fi
}
# stop_zookeeper() - Stop running processes (non-screen)