From 8e931cad557f49fb2f1bf6b58d6eeb7f07d9f06f Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg@ubuntu.com>
Date: Mon, 5 May 2014 15:01:54 -0700
Subject: [PATCH] Archive Ironic VM nodes console logs

Set log directory in localrc for Ironic deployment and archive these
logs as part of cleanup_host().

Change-Id: Ia99e5b22cc43124c582369b7ddaf0455d2d606e4
---
 devstack-vm-gate.sh | 1 +
 functions.sh        | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 8cf323fd..0b8f6492 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -115,6 +115,7 @@ EOF
         echo "VIRT_DRIVER=ironic" >>localrc
         echo "IRONIC_BAREMETAL_BASIC_OPS=True" >>localrc
         echo "IRONIC_VM_EPHEMERAL_DISK=1" >>localrc
+        echo "IRONIC_VM_LOG_DIR=$BASE/$LOCALRC_OLDNEW/ironic-bm-logs" >>localrc
         echo "DEFAULT_INSTANCE_TYPE=baremetal" >>localrc
     fi
 
diff --git a/functions.sh b/functions.sh
index 5fcc55c0..2196c275 100644
--- a/functions.sh
+++ b/functions.sh
@@ -515,6 +515,12 @@ function cleanup_host {
         sudo cp $BASE/status/stack/*.failure $BASE/logs/status/
     fi
 
+    # Copy Ironic nodes console logs if they exist
+    if [ -d $BASE/new/ironic-bm-logs ] ; then
+      sudo mkdir -p $BASE/logs/ironic-bm-logs
+      sudo cp $BASE/new/ironic-bm-logs/*.log $BASE/logs/ironic-bm-logs/
+    fi
+
     # Copy tempest config file
     sudo cp $BASE/new/tempest/etc/tempest.conf $NEWLOGTARGET/tempest_conf.txt