From c25002c3d875c6dc48da735a802bb4dcd9cec11d Mon Sep 17 00:00:00 2001 From: Paul Bourke Date: Tue, 22 Mar 2016 12:29:30 +0000 Subject: [PATCH] Check relevant logging mechanism in the gate Avoids errors about missing journalctl on Ubuntu and missing upstart on redhat bases. Closes-Bug: 1554724 Change-Id: I80bb55688398df85f9020d5cfe5dda757fc5a0ef --- tools/deploy_aio.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/deploy_aio.sh b/tools/deploy_aio.sh index 8f3c96222f..ba7ef9c49d 100755 --- a/tools/deploy_aio.sh +++ b/tools/deploy_aio.sh @@ -32,8 +32,11 @@ function check_failure { docker logs --tail all ${failed} done - journalctl --no-pager -u docker.service - cat /var/log/upstart/docker.log + if [[ -x "$(command -v journalctl)" ]]; then + journalctl --no-pager -u docker.service + else + cat /var/log/upstart/docker.log + fi nova service-list neutron agent-list