Merge lp:~le-chi-thu/lava-deployment-tool/add-dispatch-config into lp:~linaro-validation/lava-deployment-tool/trunk

[Le Chi Thu]

Add configuration wizard for lava-dispatcher. Only two parameters (LAVA_SERVER_IP and LAVA_PROXY) are need user input. Other parameters are calculated. Also the apache conf is correctly setup for dispatcher.

[lp:~le-chi-thu/lava-deployment-tool/add-dispatch-config]

168. By Le Chi Thu <email address hidden> <email address hidden> on 2012-04-24

Minor update after the review 1

169. By Le Chi Thu <email address hidden> <email address hidden> on 2012-04-24

Fixed typo error

170. By Le Chi Thu <email address hidden> <email address hidden> on 2012-04-24

Minor update after the review 2

171. By Le Chi Thu <email address hidden> <email address hidden> on 2012-04-25

Minor update after the review 2

[Zygmunt Krynicki (zyga)]

+1

Approving after discussion and review on IRC

review: Approve

=== modified file 'lava-deployment-tool'
--- lava-deployment-tool	2012-04-06 00:20:45 +0000
+++ lava-deployment-tool	2012-04-25 08:05:21 +0000
@@ -1,5 +1,5 @@
 #!/bin/bash
-LAVA_DEPLOYMENT_TOOL_VERSION="0.3"
+LAVA_DEPLOYMENT_TOOL_VERSION="0.4"
 
 # Global Configuration
 
@@ -104,6 +104,8 @@
 LAVA_RABBIT_PASSWORD='$LAVA_RABBIT_PASSWORD'
 # Scheduler configuration
 LAVA_SCHEDULER_ENABLED='$LAVA_SCHEDULER_ENABLED'
+LAVA_SERVER_IP='$LAVA_SERVER_IP'
+LAVA_PROXY='$LAVA_PROXY'
 INSTANCE_CONF
 }
 
@@ -303,6 +305,9 @@
     mkdir -p $LAVA_PREFIX/$LAVA_INSTANCE/etc/lava-server/templates
     # Static file cache
     mkdir -p $LAVA_PREFIX/$LAVA_INSTANCE/var/www/lava-server/static
+    # Lava-dispatcher folders
+    mkdir -p $LAVA_PREFIX/$LAVA_INSTANCE/var/cache/lava-dispatcher
+    mkdir -p $LAVA_PREFIX/$LAVA_INSTANCE/var/www/lava-server/images
     # Repository of precious user-generated data (needs backup)
     mkdir -p $LAVA_PREFIX/$LAVA_INSTANCE/var/lib/lava-server/media
     # Celery state 
@@ -716,6 +721,12 @@
         SetHandler      none
     </Location>
     # We don't need media files as those are private in our implementation
+ 
+    # images folder for lava-dispatcher tarballs
+    <Location /images>
+        SetHandler      none
+    </Location>
+
 
 </VirtualHost>
 INSTANCE_SITE
@@ -780,6 +791,8 @@
     set +x
     deactivate
 
+    gen_lava_dispatcher_config
+
     if [ ! -e $LAVA_PREFIX/$LAVA_INSTANCE/etc/lava-server/settings.conf ]; then
         if [ -e $LAVA_PREFIX/$LAVA_INSTANCE/src/lava-server ]; then
             # We're in editable server mode, let's use alternate paths for tempates and static files
@@ -864,9 +877,103 @@
 wizard_config_app() {
     local _question="Do you want to enable the scheduler in this instance?"
     whiptail --title "Enable the scheduler?" --yesno "$_question" 10 40 && LAVA_SCHEDULER_ENABLED=yes || LAVA_SCHEDULER_ENABLED=no
+
+    local _question="Do you want to config the lava-dispatcher?"
+    whiptail --title "Configurate the lava-dispatcher?" --yesno "$_question" 10 40 && LAVA_DISPATCHER_CONFIG=yes || LAVA_DISPATCHER_CONFIG=no
+    
+    if [ $LAVA_DISPATCHER_CONFIG = yes ]; then
+        config_lava_dispatcher
+    fi
+           
     return 0
 }
 
+config_lava_dispatcher() {
+    echo "Lava Dispatcher Configuration"
+    echo "-----------------------------"
+
+    echo "LAVA_SERVER_IP"
+    echo "^^^^^^^^^^^^^^"
+    echo "This is the IP the device downloads the image parts from"
+    echo ""
+    echo "Here is the list of network device on this host"
+
+    ifconfig | grep 'Ethernet\|inet addr'
+
+    while true; do
+
+        read -p "Please enter the IP address: " LAVA_SERVER_IP
+
+        if test -n "$LAVA_SERVER_IP" && echo "$LAVA_SERVER_IP" | grep -q -E -e '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}'; then
+            echo "The IP address is '$LAVA_SERVER_IP'"
+            break
+        else
+            echo "Incorrect IP address"
+        fi
+    done
+
+    echo
+    echo "LAVA_PROXY"
+    echo "^^^^^^^^^^"
+
+    echo "This is the address and port of cache proxy service, format is like:"
+    echo "http://192.168.1.10:3128/"
+    read -p "Please enter the URL: " LAVA_PROXY
+
+
+    # Location for rootfs/boot tarballs extracted from images
+    export LAVA_IMAGE_TMPDIR=$LAVA_PREFIX/$LAVA_INSTANCE/var/www/lava-server/images
+
+    # URL where LAVA_IMAGE_TMPDIR can be accessed remotely
+    export LAVA_IMAGE_URL=http://$SERVER_IP/lava-server/images
+
+    # Location on the device for storing test results.
+    export LAVA_RESULT_DIR=$LAVA_PREFIX/$LAVA_INSTANCE/tmp
+
+    # Location for caching downloaded artifacts such as hwpacks and images
+    export LAVA_CACHEDIR=$LAVA_PREFIX/$LAVA_INSTANCE/var/cache/lava-dispatcher
+
+}
+
+gen_lava_dispatcher_config() {
+    LAVA_DISPATCHER_CONFIG_FILE=$LAVA_PREFIX/$LAVA_INSTANCE/etc/lava-dispatcher/lava-dispatcher.conf
+
+    echo "Creating lava-dispatcher config file $LAVA_DISPATCHER_CONFIG_FILE"
+    sudo sh -c "cat >$LAVA_DISPATCHER_CONFIG_FILE" <<LAVA_DISPATCHER_CONF
+# This file was automatically generated by lava-deployment-tool.sh
+
+LAVA_SERVER_IP = $LAVA_SERVER_IP
+
+# Location for rootfs/boot tarballs extracted from images
+LAVA_IMAGE_TMPDIR = $LAVA_IMAGE_TMPDIR
+
+# URL where LAVA_IMAGE_TMPDIR can be accessed remotely
+LAVA_IMAGE_URL = http://%(LAVA_SERVER_IP)s/images
+
+# Location on the device for storing test results.
+LAVA_RESULT_DIR = $LAVA_RESULT_DIR
+
+# Location for caching downloaded artifacts such as hwpacks and images
+LAVA_CACHEDIR = $LAVA_CACHEDIR
+
+# This is the address and port of cache proxy service, format is like:
+# LAVA_PROXY = http://192.168.1.10:3128/
+LAVA_PROXY = $LAVA_PROXY
+
+# The url point to the version of lava-test to be install with pip
+#LAVA_TEST_URL = bzr+http://bazaar.launchpad.net/~le-chi-thu/lava-test/enabled-file-cache/#egg=lava-test
+
+# Python logging level to use
+# # 10 = DEBUG
+# # 20 = INFO
+# # 30 = WARNING
+# # 40 = ERROR
+# # Messages with a lower number than LOGGING_LEVEL will be suppressed
+# LOGGING_LEVEL = 10
+
+LAVA_DISPATCHER_CONF
+
+}
 
 install_config_app() {
     # Enable virtualenv