Merge lp:~johnsca/charms/precise/couchbase/fix-install into lp:charms/couchbase

[Cory Johns]

[Cory Johns (johnsca)]

Fixes the intermittent error reported in this bug: https://bugs.launchpad.net/charms/+source/couchbase/+bug/1074344

Also fixes the hard-coded open-port paths that also affected couchdb: https://code.launchpad.net/~johnsca/charms/precise/couchbase/fix-install/+merge/243575

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-10888-results

review: Needs Fixing (automated testing)

[José Antonio Rey (jose)]

Hey Cory!

I have given this a run an deploys successfully. Thanks for the fix!

+1

review: Approve

=== modified file 'hooks/install'
--- hooks/install	2013-02-08 18:55:26 +0000
+++ hooks/install	2015-01-08 18:16:00 +0000
@@ -5,7 +5,7 @@
 set -ux
 
 apt-get -y install python-software-properties
-apt-add-repository ppa:facter-plugins/ppa
+apt-add-repository -y ppa:facter-plugins/ppa
 apt-get -y update
 apt-get -y install facter facter-customfacts-plugin curl uuid pwgen libssl0.9.8
 
@@ -71,6 +71,20 @@
 
 service couchbase-server status && service couchbase-server restart || service couchbase-server start
 
+echo "Waiting for couchbase-server..."
+seconds=0
+check_server_cmd="/opt/couchbase/bin/couchbase-cli server-info -c ${COUCHBASE_IP}:${COUCHBASE_PORT} \
+    -u ${DEFAULT_CLUSTER_USERNAME} -p ${DEFAULT_CLUSTER_PASSWORD}"
+until $check_server_cmd > /dev/null; do
+    sleep 1
+    seconds=$((seconds+1))
+    if [ $seconds -gt 30 ]; then
+        echo "Time out waiting for couchbase-server"
+        $check_server_cmd
+        exit 1
+    fi
+done
+
 /opt/couchbase/bin/couchbase-cli cluster-init \
   -c ${COUCHBASE_IP}:${COUCHBASE_PORT} \
   --cluster-init-username=${DEFAULT_CLUSTER_USERNAME} \
@@ -87,5 +101,5 @@
   --bucket-replica=${COUCHBASE_BUCKET_REPLICA}
 
 # Open the necessary ports
-[ -x /usr/bin/open-port ] && open-port ${COUCHBASE_PORT}/TCP
-[ -x /usr/bin/open-port ] && open-port ${COUCHBASE_CLUSTER_PORT}/TCP
+open-port ${COUCHBASE_PORT}/TCP
+open-port ${COUCHBASE_CLUSTER_PORT}/TCP