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

[Neil Williams]

Adds idempotent support for creating the lava-coordinator configuration file on worker nodes only.

[Antonio Terceiro (terceiro)]

> === modified file 'lava-deployment-tool'
> --- lava-deployment-tool 2013-09-13 09:05:47 +0000
> +++ lava-deployment-tool 2013-09-13 09:05:48 +0000
> @@ -33,7 +33,7 @@
>
> # Installation and configuration steps (all the wizard_xxx install_xxx functions)
> LAVA_INSTALL_STEPS="devmode user fs buildout database web_hosting app config_app docs"
> -LAVA_WORKER_STEPS="get_master devmode user fs buildout remote_database web_hosting app config_app remote_fs"
> +LAVA_WORKER_STEPS="get_master devmode user fs buildout remote_database web_hosting app config_app remote_fs coordinator"
>
> # Will cause Django to be run with DEBUG enabled.
> LAVA_DEV_MODE=no
> @@ -666,6 +666,27 @@
> ssh-keyscan -H $LAVA_REMOTE_FS_HOST | sudo -u $LAVA_SYS_USER tee $sshdir/known_hosts
> }
>
> +install_coordinator () {
> + # put the lava-coordinator conf file in place
> + if [ ! -d /etc/lava-coordinator ]; then
> + sudo mkdir /etc/lava-coordinator
> + fi
> + if [ ! -f /etc/lava-coordinator/lava-coordinator.conf ]; then
> + sudo sh -c "cat >/etc/lava-coordinator/lava-coordinator.conf" <<EOF

this won't work because the shell redirection is handled by shell running the
lava-deployment-tool process with the UID of the user running it.

you want something like this:

  sudo tee /etc/lava-coordinator/lava-coordinator.conf >/dev/null <<EOF

[Antonio Terceiro (terceiro)]

On Fri, Sep 13, 2013 at 11:17:22AM -0300, Antonio Terceiro wrote:
> > === modified file 'lava-deployment-tool'
> > --- lava-deployment-tool 2013-09-13 09:05:47 +0000
> > +++ lava-deployment-tool 2013-09-13 09:05:48 +0000
> > @@ -33,7 +33,7 @@
> >
> > # Installation and configuration steps (all the wizard_xxx install_xxx functions)
> > LAVA_INSTALL_STEPS="devmode user fs buildout database web_hosting app config_app docs"
> > -LAVA_WORKER_STEPS="get_master devmode user fs buildout remote_database web_hosting app config_app remote_fs"
> > +LAVA_WORKER_STEPS="get_master devmode user fs buildout remote_database web_hosting app config_app remote_fs coordinator"
> >
> > # Will cause Django to be run with DEBUG enabled.
> > LAVA_DEV_MODE=no
> > @@ -666,6 +666,27 @@
> > ssh-keyscan -H $LAVA_REMOTE_FS_HOST | sudo -u $LAVA_SYS_USER tee $sshdir/known_hosts
> > }
> >
> > +install_coordinator () {
> > + # put the lava-coordinator conf file in place
> > + if [ ! -d /etc/lava-coordinator ]; then
> > + sudo mkdir /etc/lava-coordinator
> > + fi
> > + if [ ! -f /etc/lava-coordinator/lava-coordinator.conf ]; then
> > + sudo sh -c "cat >/etc/lava-coordinator/lava-coordinator.conf" <<EOF
>
> this won't work because the shell redirection is handled by shell running the
> lava-deployment-tool process with the UID of the user running it.
>
> you want something like this:
>
> sudo tee /etc/lava-coordinator/lava-coordinator.conf >/dev/null <<EOF

Nah, I'm wrong. The redirection is inside the -c argument and it will
work as intended. Nevermind

 review approve

review: Approve

=== modified file 'lava-deployment-tool'
--- lava-deployment-tool	2013-09-13 09:05:47 +0000
+++ lava-deployment-tool	2013-09-13 09:05:48 +0000
@@ -33,7 +33,7 @@
 
 # Installation and configuration steps (all the wizard_xxx install_xxx functions)
 LAVA_INSTALL_STEPS="devmode user fs buildout database web_hosting app config_app docs"
-LAVA_WORKER_STEPS="get_master devmode user fs buildout remote_database web_hosting app config_app remote_fs"
+LAVA_WORKER_STEPS="get_master devmode user fs buildout remote_database web_hosting app config_app remote_fs coordinator"
 
 # Will cause Django to be run with DEBUG enabled.
 LAVA_DEV_MODE=no
@@ -666,6 +666,27 @@
     ssh-keyscan -H $LAVA_REMOTE_FS_HOST | sudo -u $LAVA_SYS_USER tee $sshdir/known_hosts
 }
 
+install_coordinator () {
+    # put the lava-coordinator conf file in place
+    if [ ! -d /etc/lava-coordinator ]; then
+        sudo mkdir /etc/lava-coordinator
+    fi
+    if [ ! -f /etc/lava-coordinator/lava-coordinator.conf ]; then
+        sudo sh -c "cat >/etc/lava-coordinator/lava-coordinator.conf" <<EOF
+{
+    "port": 3079,
+    "blocksize": 4096,
+    "poll_delay": 3,
+    "coordinator_hostname": "$LAVA_MASTER"
+}
+EOF
+    fi
+}
+
+wizard_coordinator () {
+    true
+}
+
 defaults_buildout () {
     true
 }
@@ -990,6 +1011,7 @@
     else
         rm $BASE/*
     fi
+    cwd=`pwd`
     cd `dirname $0`
     if [ ! -d ./doc/modules ]; then
         mkdir ./doc/modules
@@ -999,7 +1021,6 @@
     if [ -d doc/_build ]; then
         rm -rf doc/_build/
     fi
-    cwd=`pwd`
     for dir in $LAVA_PREFIX/$LAVA_INSTANCE/code/current/branch-cache/*; do
         module=`basename $dir`
         latest=`ls -t1 $dir/checkouts/|head -n1`
@@ -1128,6 +1149,11 @@
     gen_lava_dispatcher_config
 
     ln -sfT $code $LAVA_PREFIX/$LAVA_INSTANCE/code/current
+    if [ "$LAVA_INSTALL_STEPS" != "$LAVA_WORKER_STEPS" ] ; then
+        install_docs
+        # the coordinator call is idempotent
+        install_coordinator
+    fi
 }
 
 
@@ -1705,9 +1731,6 @@
     install_app
     _maybe_post_convert_to_buildout
     install_config_app
-    if [ "$LAVA_INSTALL_STEPS" != "$LAVA_WORKER_STEPS" ] ; then
-        install_docs
-    fi
 }