diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-11 16:06:27 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-11 16:06:27 -0300 |
| commit | 02fde33acd3022b1a684c3aaa42b4d2052d1c830 (patch) | |
| tree | f73155cc2e46c598a80a287502cc903939ebce89 | |
| parent | 02d4470e1ff26350a2e02567246627aaf09455eb (diff) | |
| download | openshift-02fde33acd3022b1a684c3aaa42b4d2052d1c830.tar.gz openshift-02fde33acd3022b1a684c3aaa42b4d2052d1c830.tar.bz2 openshift-02fde33acd3022b1a684c3aaa42b4d2052d1c830.tar.xz openshift-02fde33acd3022b1a684c3aaa42b4d2052d1c830.zip | |
Add dependency on docker to openshift_docker role.
I think this is intended anytime a role uses openshift_docker.
Fixes issue where docker_version is ignored for rpm based installs. We
made the dependency in openshift_version conditional to allow use of
openshift_version without significantly impacting the system, however
nothing ever actually ran the docker role after that, resulting in
docker simply being installed via the rpm dependency on
atomic-openshift.
| -rw-r--r-- | roles/openshift_docker/meta/main.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_docker/meta/main.yml b/roles/openshift_docker/meta/main.yml index c1a6611d1..10131f717 100644 --- a/roles/openshift_docker/meta/main.yml +++ b/roles/openshift_docker/meta/main.yml @@ -13,3 +13,5 @@ galaxy_info: - cloud dependencies: - role: openshift_version +- role: openshift_docker_facts +- role: docker |