diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-12 17:07:01 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-12 17:07:01 -0400 |
| commit | 7967d127716de50f63dca9bd137f43ab642770bf (patch) | |
| tree | f8d4826c58fff02dd7e1e24bccbee2ba79ab4a54 /roles/openshift_docker_facts | |
| parent | df44d99957b9d44bf9d221b224a46865c3224d2c (diff) | |
| parent | 0879620498b1251f3a375b9a5657c16dd571906a (diff) | |
| download | openshift-7967d127716de50f63dca9bd137f43ab642770bf.tar.gz openshift-7967d127716de50f63dca9bd137f43ab642770bf.tar.bz2 openshift-7967d127716de50f63dca9bd137f43ab642770bf.tar.xz openshift-7967d127716de50f63dca9bd137f43ab642770bf.zip | |
Merge pull request #1718 from brenton/docker1
Containerized installs on RHEL were downgrading docker unnecessarily
Diffstat (limited to 'roles/openshift_docker_facts')
| -rw-r--r-- | roles/openshift_docker_facts/tasks/main.yml | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/roles/openshift_docker_facts/tasks/main.yml b/roles/openshift_docker_facts/tasks/main.yml index eb762e33f..7ea359af1 100644 --- a/roles/openshift_docker_facts/tasks/main.yml +++ b/roles/openshift_docker_facts/tasks/main.yml @@ -46,10 +46,24 @@ register: common_version failed_when: false changed_when: false - when: not openshift.common.is_atomic | bool + when: not openshift.common.is_containerized | bool + +- set_fact: + l_common_version: "{{ openshift.common.image_tag | default('0.0', True) | oo_image_tag_to_rpm_version }}" + when: openshift.common.is_containerized | bool + +- set_fact: + l_common_version: "{{ common_version.stdout | default('0.0', True) }}" + when: not openshift.common.is_containerized | bool - name: Set docker version to be installed set_fact: docker_version: "{{ '1.8.2' }}" - when: " ( common_version.stdout | default('0.0', True) | version_compare('3.2','<') and openshift.common.service_type == 'atomic-openshift' ) or - ( common_version.stdout | default('0.0', True) | version_compare('1.1.4','<') and openshift.common.service_type == 'origin' )" + when: " ( l_common_version | version_compare('3.2','<') and openshift.common.service_type == '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 | 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' )" |