Merge lp:~codehelp/lava-deployment-tool/worker-postgres into lp:~linaro-validation/lava-deployment-tool/trunk

[Neil Williams]

Fresh installs of a worker setup currently fail to connect to the master database. This patch ensures that a worker has sufficient postgres client support for the lava_scheduler_daemon to run correctly, including avoiding an unnecessary build of the uWSGI module on a worker without apache2.

[Antonio Terceiro (terceiro)]

LGTM

 review approve

review: Approve

=== modified file 'lava-deployment-tool'
--- lava-deployment-tool	2013-09-11 14:03:47 +0000
+++ lava-deployment-tool	2013-09-11 14:57:24 +0000
@@ -59,7 +59,7 @@
                 oneiric|precise)
                     export LAVA_PYTHON=python2.7
                     export LAVA_SUPPORTED=1
-                    LAVA_WORKER_LIST="whiptail python-virtualenv python-pip git build-essential $LAVA_PYTHON-dev libxml2-dev mercurial conmux linaro-image-tools unzip bzr sshfs"
+                    LAVA_WORKER_LIST="whiptail python-virtualenv python-pip git build-essential $LAVA_PYTHON-dev libxml2-dev mercurial conmux linaro-image-tools unzip bzr sshfs postgresql-client postgresql-common libpq-dev"
                     LAVA_SERVER_ADD="apache2 apache2-dev postgresql lava-coordinator python-sphinx python-versiontools"
                     ;;
                 quantal|raring)
@@ -67,7 +67,7 @@
                     #see http://changelogs.ubuntu.com/changelogs/pool/main/a/apache2/apache2_2.2.22-6ubuntu2/changelog
                     export LAVA_PYTHON=python2.7
                     export LAVA_SUPPORTED=1
-                    LAVA_WORKER_LIST="whiptail python-virtualenv python-pip git build-essential $LAVA_PYTHON-dev libxml2-dev mercurial conmux linaro-image-tools unzip bzr sshfs"
+                    LAVA_WORKER_LIST="whiptail python-virtualenv python-pip git build-essential $LAVA_PYTHON-dev libxml2-dev mercurial conmux linaro-image-tools unzip bzr sshfs postgresql-client postgresql-common libpq-dev"
                     LAVA_SERVER_ADD="apache2 apache2-threaded-dev postgresql lava-coordinator python-sphinx python-versiontools"
                     ;;
             esac
@@ -1601,19 +1601,21 @@
 end script
 LAVA_CONF
 
-        if [ \! -e /etc/apache2/mods-available/uwsgi.load ]; then
-            echo "Building uWSGI apache module..."
-            _tmpdir="$(mktemp -d)"
+        if [ "$LAVA_INSTALL_STEPS" != "$LAVA_WORKER_STEPS" ] ; then
+            if [ \! -e /etc/apache2/mods-available/uwsgi.load ]; then
+                echo "Building uWSGI apache module..."
+                _tmpdir="$(mktemp -d)"
 
-            trap "rm -rf \"${_tmpdir}\"" EXIT
-            set -x
-            pushd $_tmpdir
-            tar -xzf $LAVA_DOWNLOAD_CACHE/dist/uwsgi-$LAVA_UWSGI.tar.gz --strip-components=1
-            cd apache2
-            apxs2 -c mod_uwsgi.c
-            sudo apxs2 -i -a mod_uwsgi.la
-            popd
-            set +x
+                trap "rm -rf \"${_tmpdir}\"" EXIT
+                set -x
+                pushd $_tmpdir
+                tar -xzf $LAVA_DOWNLOAD_CACHE/dist/uwsgi-$LAVA_UWSGI.tar.gz --strip-components=1
+                cd apache2
+                apxs2 -c mod_uwsgi.c
+                sudo apxs2 -i -a mod_uwsgi.la
+                popd
+                set +x
+            fi
         fi
 
         # Store setup version