Zun

Comment 7 for bug 1647459

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to kuryr-libnetwork (master)

Reviewed: https://review.openstack.org/407172
Committed: https://git.openstack.org/cgit/openstack/kuryr-libnetwork/commit/?id=0e5b4205842c33c3880e82c292c1a2da01e8d23e
Submitter: Jenkins
Branch: master

commit 0e5b4205842c33c3880e82c292c1a2da01e8d23e
Author: Hongbin Lu <email address hidden>
Date: Mon Dec 5 13:58:04 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".

    This commit added check for "docker" as well.

    Closes-Bug: #1647459
    Change-Id: If89d8b62ffa542f0491f43d42a119741882eb3cd