Install ZK on travis and wait for it to start

This should fix Travis and occasional failures in Drone where ZK isn't
present / wasn't started yet.

install-reddit.sh

@@ -38,6 +38,7 @@ NEEDED=(
     "install_apt.sh"
     "install_cassandra.sh"
     "install_services.sh"
+    "install_zookeeper.sh"
     "reddit.sh"
     "setup_cassandra.sh"
     "setup_mcrouter.sh"

install/install_services.sh

@@ -40,7 +40,6 @@ haproxy
 nginx
 gunicorn
 redis-server
-zookeeperd
 PACKAGES
 
 ###############################################################################

install/install_zookeeper.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+# The contents of this file are subject to the Common Public Attribution
+# License Version 1.0. (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
+# License Version 1.1, but Sections 14 and 15 have been added to cover use of
+# software over a computer network and provide for limited attribution for the
+# Original Developer. In addition, Exhibit A has been modified to be consistent
+# with Exhibit B.
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+# the specific language governing rights and limitations under the License.
+#
+# The Original Code is reddit.
+#
+# The Original Developer is the Initial Developer.  The Initial Developer of
+# the Original Code is reddit Inc.
+#
+# All portions of the code written by reddit are Copyright (c) 2006-2016 reddit
+# Inc. All Rights Reserved.
+###############################################################################
+
+RUNDIR=$(dirname $0)
+source $RUNDIR/install.cfg
+
+sudo apt-get install $APTITUDE_OPTIONS zookeeperd
+
+echo "Waiting for ZooKeeper to be available..."
+while ! nc -vz localhost 2181; do
+    sleep 1
+done

install/reddit.sh

@@ -88,6 +88,9 @@ $RUNDIR/install_apt.sh
 # install cassandra from datastax
 $RUNDIR/install_cassandra.sh
 
+# install zookeeper
+$RUNDIR/install_zookeeper.sh
+
 # install services (rabbitmq, postgres, memcached, etc.)
 $RUNDIR/install_services.sh
 

install/travis.sh

@@ -79,6 +79,7 @@ fi
 $RUNDIR/install_apt.sh
 
 $RUNDIR/install_cassandra.sh
+$RUNDIR/install_zookeeper.sh
 
 ###############################################################################
 # Install and configure the reddit code