aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-09 04:17:50 +0000
committerGerrit Code Review <review@openstack.org>2016-03-09 04:17:50 +0000
commitf14b931286b24a9d0c75239ef4cae0144d3a2bba (patch)
treeafbc50c9900161e622488ee0235122f75416d2bd /tools
parent8c2351ed7da9b4a8c4e0202bf071ffd2dbaa925b (diff)
parent12d6eeceb5dc1021d66aa89930606cc9bc04e79f (diff)
downloadkolla-f14b931286b24a9d0c75239ef4cae0144d3a2bba.tar.gz
kolla-f14b931286b24a9d0c75239ef4cae0144d3a2bba.zip
Merge "Copy the logs out of the container"
Diffstat (limited to 'tools')
-rwxr-xr-xtools/deploy_aio.sh6
-rwxr-xr-xtools/setup_gate.sh2
2 files changed, 3 insertions, 5 deletions
diff --git a/tools/deploy_aio.sh b/tools/deploy_aio.sh
index e6ef5a11e..8f3c96222 100755
--- a/tools/deploy_aio.sh
+++ b/tools/deploy_aio.sh
@@ -9,7 +9,7 @@ export KOLLA_BASE=$1
export KOLLA_TYPE=$2
function copy_logs {
- docker cp heka:/var/log/kolla /tmp/logs
+ cp -rnL /var/lib/docker/volumes/kolla_logs/_data/* /tmp/logs/kolla/
}
function check_failure {
@@ -41,9 +41,7 @@ function check_failure {
nova list
nova list | awk '/4/ {print $2}' | xargs -n1 nova show
- # NOTE(SamYaple): The copy logs functions is put on hold until Heka is all
- # merged in. At that point we will pull the logs from Heka's volume
- #copy_logs
+ copy_logs
}
function write_configs {
diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh
index 58c11802b..4d1173994 100755
--- a/tools/setup_gate.sh
+++ b/tools/setup_gate.sh
@@ -103,7 +103,7 @@ function setup_logging {
# For ease of access we symlink that logs directory to a known path
ln -s $(pwd)/logs /tmp/logs
- mkdir -p /tmp/logs/{ansible,build}
+ mkdir -p /tmp/logs/{ansible,build,kolla}
}
setup_logging