Remove Docker 1.10 requirement temporarily.

Docker 1.10 is not widely available in RHEL / CentOS yet, lets remove
the restriction for users of master / origin. We can revert as soon as
it's available publically.

2 files changed, 17 insertions, 3 deletions

diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/docker_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/docker_upgrade.yml
new file mode 100644
index 000000000..c7b18f51b
--- /dev/null
+++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/docker_upgrade.yml
@@ -0,0 +1,14 @@
+- name: Check if Docker is installed
+  command: rpm -q docker
+  register: pkg_check
+  failed_when: pkg_check.rc > 1
+  changed_when: no
+
+- name: Upgrade Docker
+  command: "{{ ansible_pkg_mgr}} update -y docker"
+  when: pkg_check.rc == 0 and g_docker_version.curr_version | version_compare('1.9','<')
+  register: docker_upgrade
+
+- name: Restart Docker
+  command: systemctl restart docker
+  when: docker_upgrade | changed
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml
index 156e80c0f..c93bf2a17 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml
@@ -3,13 +3,13 @@
 # The restart playbook should be run after this playbook completes.
 ###############################################################################
 
-- include: ../../../../byo/openshift-cluster/upgrades/docker/docker_upgrade.yml
-
-- name: Update Docker facts
+- name: Upgrade docker
   hosts: oo_masters_to_config:oo_nodes_to_config:oo_etcd_to_config
   roles:
   - openshift_facts
   tasks:
+  - include: docker_upgrade.yml
+    when: not openshift.common.is_atomic | bool
   - name: Set post docker install facts
     openshift_facts:
       role: "{{ item.role }}"