commit 703ac9ad61bf2dac5d82386478a1aad4381ed90e
Author: Hongbin Lu <email address hidden>
Date: Mon Dec 5 14:03:36 2016 -0600
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 fedora 24.
* If docker was installed by "sudo dnf install docker-engine", the
package will be named as "docker". Therefore, it should be checked
by "rpm -q docker".
* If docker was installed by devstack (by using https://get.docker.com/), the package will be named as
"docker-engine". Therefore, it should be checked by
"rpm -q docker-engine".
Reviewed: https:/ /review. openstack. org/407179 /git.openstack. org/cgit/ openstack/ kuryr-kubernete s/commit/ ?id=703ac9ad61b f2dac5d82386478 a1aad4381ed90e
Committed: https:/
Submitter: Jenkins
Branch: master
commit 703ac9ad61bf2da c5d82386478a1aa d4381ed90e
Author: Hongbin Lu <email address hidden>
Date: Mon Dec 5 14:03:36 2016 -0600
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 fedora 24. /get.docker. com/), the package will be named as docker- engine" . Therefore, it should be checked by
* If docker was installed by "sudo dnf install docker-engine", the
package will be named as "docker". Therefore, it should be checked
by "rpm -q docker".
* If docker was installed by devstack (by using
https:/
"
"rpm -q docker-engine".
This commit added check for "docker" as well.
Change-Id: If2fc8a9d210bb6 63bfd9780c56405 3a901327a20
Closes-Bug: #1647459