Merge lp:~terceiro/lava-deployment-tool/missing-install_devmode-function into lp:~linaro-validation/lava-deployment-tool/trunk

[Antonio Terceiro]

Add missing function. It does not need to do anything, just be there to be called.

[Stevan Radaković (stevanr)]

Looks good.
Approve +1.

review: Approve

[lp:~terceiro/lava-deployment-tool/missing-install_devmode-function]

249. By Antonio Terceiro on 2013-08-29

Forbid removing instances in non-interactive mode

250. By Antonio Terceiro on 2013-08-29

Fix indentation

251. By Antonio Terceiro on 2013-08-29

Allow removing instance in non-interactive mode with --force

=== modified file 'lava-deployment-tool'
--- lava-deployment-tool	2013-08-29 23:10:35 +0000
+++ lava-deployment-tool	2013-09-02 18:06:05 +0000
@@ -42,6 +42,9 @@
 LAVA_NON_INTERACTIVE=no
 LAVA_DB_CUSTOMPWD=no
 
+# force destructive actions, specially in non-interactive mode
+LAVA_FORCE=no
+
 os_check() {
     case `lsb_release -i -s` in
         Ubuntu)
@@ -351,6 +354,10 @@
     return 1  # another loop please
 }
 
+install_devmode() {
+    true
+}
+
 defaults_user() {
     if [ $LAVA_DEV_MODE = "yes" ]; then
         export LAVA_SYS_USER=$(whoami)
@@ -447,50 +454,50 @@
 _ssh_install() {
     sshdir=$(eval echo ~$LAVA_SYS_USER)/.ssh
     if [ "$LAVA_INSTALL_STEPS" = "$LAVA_WORKER_STEPS" ]
-	then
-		# we are configuring a worker
-		if [ ! -d $sshdir ]
-		then
-			echo "SSH directory (${sshdir}) not found, creating it"
-			sudo mkdir -p $sshdir
-			sudo chown $LAVA_SYS_USER $sshdir
-		fi
+    then
+        # we are configuring a worker
+        if [ ! -d $sshdir ]
+        then
+            echo "SSH directory (${sshdir}) not found, creating it"
+            sudo mkdir -p $sshdir
+            sudo chown $LAVA_SYS_USER $sshdir
+        fi
 
-		if [ ! -f $sshdir/id_rsa ]
-		then
-			echo "Creating RSA ssh key for user $LAVA_SYS_USER"
-			sudo -u $LAVA_SYS_USER ssh-keygen -C "ssh key used by LAVA for sshfs" -f $sshdir/id_rsa -t rsa -N ""
-		fi
+        if [ ! -f $sshdir/id_rsa ]
+        then
+            echo "Creating RSA ssh key for user $LAVA_SYS_USER"
+            sudo -u $LAVA_SYS_USER ssh-keygen -C "ssh key used by LAVA for sshfs" -f $sshdir/id_rsa -t rsa -N ""
+        fi
 
         # we don't want anything under media since this will get mounted
         sudo rm -rf $LAVA_PREFIX/$LAVA_INSTANCE/var/lib/lava-server/media/*
     else
-		### we are configuring a master
-		# Setup the ssh directories in case you want to point workers at this master
-		if [ ! -d $sshdir ]
-		then
-			echo "Creating SSH directory (${sshdir}) as it didn't exist"
-			sudo mkdir -p $sshdir
-			sudo chown -R $LAVA_SYS_USER:$LAVA_SYS_USER $sshdir
-			sudo chmod 700 $sshdir
-		fi
-
-		if [ ! -f $sshdir/authorized_keys ]
-		then
-			echo "Creating an authorized_keys file, as it didn't exist"
-			sudo touch $sshdir/authorized_keys
-			sudo chown $LAVA_SYS_USER:$LAVA_SYS_USER $sshdir/authorized_keys
-			sudo chmod 600 $sshdir/authorized_keys
-		fi
-
-		# this file will allow worker nodes to check if the directory is
-		# properly mounted or not
-		sudo touch $LAVA_PREFIX/$LAVA_INSTANCE/var/lib/lava-server/media/.mounted
-
-		# ensure lava-logs and job-output is group writeable for new sshfs workers
-		sudo chmod g+w $LAVA_PREFIX/$LAVA_INSTANCE/var/lib/lava-server/media/lava-logs
-		sudo chmod g+w $LAVA_PREFIX/$LAVA_INSTANCE/var/lib/lava-server/media/job-output
-	fi
+        ### we are configuring a master
+        # Setup the ssh directories in case you want to point workers at this master
+        if [ ! -d $sshdir ]
+        then
+            echo "Creating SSH directory (${sshdir}) as it didn't exist"
+            sudo mkdir -p $sshdir
+            sudo chown -R $LAVA_SYS_USER:$LAVA_SYS_USER $sshdir
+            sudo chmod 700 $sshdir
+        fi
+
+        if [ ! -f $sshdir/authorized_keys ]
+        then
+            echo "Creating an authorized_keys file, as it didn't exist"
+            sudo touch $sshdir/authorized_keys
+            sudo chown $LAVA_SYS_USER:$LAVA_SYS_USER $sshdir/authorized_keys
+            sudo chmod 600 $sshdir/authorized_keys
+        fi
+
+        # this file will allow worker nodes to check if the directory is
+        # properly mounted or not
+        sudo touch $LAVA_PREFIX/$LAVA_INSTANCE/var/lib/lava-server/media/.mounted
+
+        # ensure lava-logs and job-output is group writeable for new sshfs workers
+        sudo chmod g+w $LAVA_PREFIX/$LAVA_INSTANCE/var/lib/lava-server/media/lava-logs
+        sudo chmod g+w $LAVA_PREFIX/$LAVA_INSTANCE/var/lib/lava-server/media/job-output
+    fi
 }
 
 install_fs() {
@@ -806,7 +813,7 @@
     done 
     for hbafile in `find /etc/postgresql -name pg_hba.conf`
     do
-        echo "host	all	all	0.0.0.0/0	trust" | sudo tee -a $hbafile > /dev/null
+        echo "host    all    all    0.0.0.0/0    trust" | sudo tee -a $hbafile > /dev/null
     done
     sudo /etc/init.d/postgresql restart
 }
@@ -1226,7 +1233,7 @@
             migrate --noinput || die "Failed to run database migrations"
         set +x
 
-    	echo "Starting instance again..."
+        echo "Starting instance again..."
         set -x
         sudo start lava-instance LAVA_INSTANCE=$LAVA_INSTANCE
         set +x
@@ -1686,6 +1693,19 @@
 cmd_remove() {
     LAVA_INSTANCE=${1:-dev}
 
+    local destroy=""
+    if [ "$LAVA_NON_INTERACTIVE" = yes ]; then
+        if [ "$LAVA_FORCE" = no ]; then
+            echo
+            echo "For safety reasons we do not allow removing an instance"
+            echo "in non-interactive mode. Try again without -n/--non-interactive"
+            echo "(or use --force)"
+            exit 1
+        else
+            destroy="DESTROY"
+        fi
+    fi
+
     _banner
 
     # Sanity checking, ensure that instance exists
@@ -1711,8 +1731,11 @@
     echo "We will remove everything in $LAVA_PREFIX/$LAVA_INSTANCE"
     echo "We will remove the apache site $LAVA_INSTANCE.conf"
     echo
-    _read_input "Type DESTROY to continue: " RESPONSE
-    test "$RESPONSE" = 'DESTROY' || return
+    _read_input "Type DESTROY to continue: " RESPONSE "$destroy"
+    if test "$RESPONSE" != 'DESTROY'; then
+        echo "Instance removal aborted."
+        exit 1
+    fi
 
     logger "Removing LAVA instance $LAVA_INSTANCE"
 
@@ -2166,6 +2189,10 @@
   Runs non-interactively. Default answers for all questions
   will be assumed.
 
+-f, --force
+  Forces potentially destructive actions to be performed, even in
+  non-interactive mode.
+
 See the README file for instructions
 END_OF_USAGE
 }
@@ -2194,9 +2221,10 @@
     fi
 
     options="
-        -o nd
+        -o ndf
         --long non-interactive
         --long developer-mode
+        --long force
     "
     TEMP="$(getopt --name ${__FILE_NAME__} $options -- "$@")"
     getopt_status=$?
@@ -2215,6 +2243,9 @@
             --developer-mode|-d)
                 LAVA_DEV_MODE=yes
                 ;;
+            --force|-f)
+                LAVA_FORCE=yes
+                ;;
             --)
                 break;;
         esac