diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-10 10:47:11 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-10 10:47:11 -0300 |
| commit | db711081e6c1b2b676c212b0eeba95da9cb9f2c5 (patch) | |
| tree | f7bb220893b9e76b4d6797e441ed50bf23d51166 /roles/openshift_docker_facts | |
| parent | 755a48c4ebf1061ce19892e5378fba769027bfc1 (diff) | |
| parent | fea08b9ba213b69667e103ff9dfd4383218e9eac (diff) | |
| download | openshift-db711081e6c1b2b676c212b0eeba95da9cb9f2c5.tar.gz openshift-db711081e6c1b2b676c212b0eeba95da9cb9f2c5.tar.bz2 openshift-db711081e6c1b2b676c212b0eeba95da9cb9f2c5.tar.xz openshift-db711081e6c1b2b676c212b0eeba95da9cb9f2c5.zip | |
Merge branch 'master' into upgrade33
Diffstat (limited to 'roles/openshift_docker_facts')
| -rw-r--r-- | roles/openshift_docker_facts/tasks/main.yml | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/roles/openshift_docker_facts/tasks/main.yml b/roles/openshift_docker_facts/tasks/main.yml index dc369e883..866b6a5fe 100644 --- a/roles/openshift_docker_facts/tasks/main.yml +++ b/roles/openshift_docker_facts/tasks/main.yml @@ -59,22 +59,3 @@ l_common_version: "{{ common_version.stdout | default('0.0', True) }}" when: not openshift.common.is_containerized | bool -- debug: var=l_common_version - -# TODO: hardcoding specific docker versions here is not going to be maintainable... -# Don't define a docker version if we don't yet know what version we're going to install. -- name: Set docker version to be installed - set_fact: - docker_version: "{{ '1.8.2' }}" - when: " l_common_version != '0.0' and - (( l_common_version | version_compare('3.2','<') and openshift.common.service_type in ['openshift', 'atomic-openshift'] ) or - ( l_common_version | version_compare('1.1.4','<') and openshift.common.service_type == 'origin' ))" - -- name: Set docker version to be installed - set_fact: - docker_version: "{{ '1.9.1' }}" - when: " l_common_version != '0.0' and - (( l_common_version | version_compare('3.2','>=') and openshift.common.service_type == 'atomic-openshift' ) or - ( l_common_version | version_compare('1.2','>=') and openshift.common.service_type == 'origin' ))" - -- debug: var=docker_version |