Merge lp:~cprov/adt-cloud-worker/uci-nova-console-log into lp:~canonical-ci-engineering/adt-cloud-worker/uci-nova

[Celso Providelo]

Return console-logging cmd-line option back to adt on open(), so it can be properly used when calling cleanup() later on.

Return console-logging cmd-line option back to adt on open(), so it can be properly used when calling cleanup() later on.

[Francis Ginther (fginther)]

Thanks for fixing this.

review: Approve

=== modified file 'uci-nova'
--- uci-nova	2015-04-02 02:46:04 +0000
+++ uci-nova	2015-04-05 03:58:17 +0000
@@ -55,6 +55,7 @@
 
 SRVNAME=""
 NET_ID=""
+CONSOLE=""
 DEBUG=""
 
 
@@ -244,13 +245,18 @@
     # purge the device host key so that SSH doesn't print a scary warning
     ssh-keygen -f ~/.ssh/known_hosts -R $ipaddr >/dev/null 2>&1 || true
 
+    ADT_EXTRA_OPTS="-n $SRVNAME"
+    if [ -n "$CONSOLE" ]; then
+        ADT_EXTRA_OPTS="$ADT_EXTRA_OPTS -c $CONSOLE"
+    fi
+
     # Return access information to adt-virt-ssh.
     cat<<EOF
 identity=$SSH_IDENTITY
 login=$SSH_USER
 hostname=$ipaddr
 capabilities=$CAPABILITIES
-extraopts=-n $SRVNAME
+extraopts=$ADT_EXTRA_OPTS
 EOF
     if [ -n "$SUDO_PASSWORD" ]; then
         echo "password=$SUDO_PASSWORD"