Zun

Comment 8 for bug 1647459

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

Reviewed: https://review.openstack.org/407179
Committed: https://git.openstack.org/cgit/openstack/kuryr-kubernetes/commit/?id=703ac9ad61bf2dac5d82386478a1aad4381ed90e
Submitter: Jenkins
Branch: master

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".

    This commit added check for "docker" as well.

    Change-Id: If2fc8a9d210bb663bfd9780c564053a901327a20
    Closes-Bug: #1647459