aboutsummaryrefslogtreecommitdiff
path: root/tools/deploy_aio.sh
diff options
context:
space:
mode:
authorPaul Bourke <paul.bourke@oracle.com>2016-03-22 12:29:30 +0000
committerPaul Bourke <paul.bourke@oracle.com>2016-03-22 14:43:07 +0000
commitc25002c3d875c6dc48da735a802bb4dcd9cec11d (patch)
tree6620e55baa9dbbecffe6e6866ed3cb3e0b036696 /tools/deploy_aio.sh
parentba6ea72a3737716e709e69d7224edc03b7c3f853 (diff)
downloadkolla-c25002c3d875c6dc48da735a802bb4dcd9cec11d.tar.gz
kolla-c25002c3d875c6dc48da735a802bb4dcd9cec11d.zip
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
Diffstat (limited to 'tools/deploy_aio.sh')
-rwxr-xr-xtools/deploy_aio.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/deploy_aio.sh b/tools/deploy_aio.sh
index 8f3c96222..ba7ef9c49 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