openstack
/
zun
Code Issues Proposed changes

Fix the check of docker installation 

In before, we checked docker installation by:

  $ rpm -q docker-engine

However, this doesn't work for all cases. In some cases, the docker
installation is of name "docker" instead of "docker-engine". This
commit added check for "docker" as well.

Change-Id: I49ef8cfe4bcf1d22770ba143c6301d8b54e9d372
Closes-Bug: #1647459
This commit is contained in:
Hongbin Lu 2016-12-05 14:06:14 -06:00
parent 5944db6a62
commit d43b709ef8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/lib/zun
View File

@ -79,7 +79,7 @@ function check_docker {
if is_ubuntu; then
dpkg -s docker-engine > /dev/null 2>&1
else
rpm -q docker-engine > /dev/null 2>&1
rpm -q docker-engine > /dev/null 2>&1 || rpm -q docker > /dev/null 2>&1
fi
}