diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-16 14:27:20 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-16 14:27:20 -0300 |
| commit | 78dd487871796a71c450a1a1daf78b079a3a1090 (patch) | |
| tree | 1498e29b8971064dafd7f75e01c2ed0273a15264 /playbooks/common | |
| parent | 42dec74c57fa76e31a588b2a58f913c68825360d (diff) | |
| download | openshift-78dd487871796a71c450a1a1daf78b079a3a1090.tar.gz openshift-78dd487871796a71c450a1a1daf78b079a3a1090.tar.bz2 openshift-78dd487871796a71c450a1a1daf78b079a3a1090.tar.xz openshift-78dd487871796a71c450a1a1daf78b079a3a1090.zip | |
Cleanup, fix 3.1 version bug in facts.
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml | 5 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/rpm_upgrade.yml | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml index a5a9a0fec..e5a1d30f7 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml @@ -206,10 +206,9 @@ g_docker_version: "{{ g_atomic_docker_version_result.stdout | from_yaml }}" when: openshift.common.is_atomic | bool - # TODO: Update to 1.10 once branch merges - fail: - msg: This playbook requires access to Docker 1.9 or later - when: g_docker_version.avail_version | default(g_docker_version.curr_version, true) | version_compare('1.9','<') + msg: This playbook requires access to Docker 1.10 or later + when: g_docker_version.avail_version | default(g_docker_version.curr_version, true) | version_compare('1.10','<') # TODO: add check to upgrade ostree to get latest Docker diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/rpm_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/rpm_upgrade.yml index ea27a40d1..1d97d3802 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/rpm_upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/rpm_upgrade.yml @@ -1,4 +1,4 @@ -# TODO: Use a specific version here once we're setting openshift_pkg_version reliably in the openshift_version module. +# We verified latest rpm available is suitable, so just yum update. - name: Upgrade packages command: "{{ ansible_pkg_mgr}} update -y {{ openshift.common.service_type }}-{{ component }}" |