From d43b709ef8f3b833830d45cef829e268ab72ddb7 Mon Sep 17 00:00:00 2001
From: Hongbin Lu <hongbin.lu@huawei.com>
Date: Mon, 5 Dec 2016 14:06:14 -0600
Subject: [PATCH] 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
---
 devstack/lib/zun | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devstack/lib/zun b/devstack/lib/zun
index ea3e0cad7..016d5b601 100644
--- a/devstack/lib/zun
+++ b/devstack/lib/zun
@@ -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
 }