From 47c8c0b1df866b86b111e3e03b827011ec4c341c Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Tue, 31 May 2016 11:56:13 -0300 Subject: Break version calc out into a role, separate yaml for containerized/rpm. --- roles/openshift_docker/meta/main.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'roles/openshift_docker/meta') diff --git a/roles/openshift_docker/meta/main.yml b/roles/openshift_docker/meta/main.yml index d98f953ea..c1a6611d1 100644 --- a/roles/openshift_docker/meta/main.yml +++ b/roles/openshift_docker/meta/main.yml @@ -12,6 +12,4 @@ galaxy_info: categories: - cloud dependencies: -- role: openshift_repos -- role: openshift_docker_facts -- role: docker +- role: openshift_version -- cgit v1.2.3 From 02fde33acd3022b1a684c3aaa42b4d2052d1c830 Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Mon, 11 Jul 2016 16:06:27 -0300 Subject: 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. --- roles/openshift_docker/meta/main.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'roles/openshift_docker/meta') 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 -- cgit v1.2.3