Merge pull request #2082 from abutcher/upgrade-docker

Don't upgrade docker on non-containerized etcd.

playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml

@@ -212,6 +212,9 @@
       msg: Upgrade packages not found
     when: openshift_image_tag is not defined and (g_aos_versions.avail_version | default(g_aos_versions.curr_version, true) | version_compare(target_version, '<'))
 
+- name: Verify docker upgrade targets
+  hosts: oo_masters_to_config:oo_nodes_to_config:oo_etcd_to_config
+  tasks:
   - name: Determine available Docker
     script: ../files/rpm_versions.sh docker
     register: g_docker_version_result

playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml

@@ -4,7 +4,7 @@
 ###############################################################################
 
 - name: Upgrade docker
-  hosts: oo_masters_to_config:oo_nodes_to_config:oo_etcd_to_config
+  hosts: oo_masters_to_config:oo_nodes_to_config
   roles:
   - openshift_facts
   tasks:
@@ -20,6 +20,15 @@
         openshift_image_tag: "v{{ g_new_version }}"
         openshift_version: "{{ g_new_version }}"
 
+- name: Upgrade docker
+  hosts: oo_etcd_to_config
+  roles:
+  - openshift_facts
+  tasks:
+  # Upgrade docker when host is not atomic and host is not a non-containerized etcd node
+  - include: docker_upgrade.yml
+    when: not openshift.common.is_atomic | bool and not ('oo_etcd_to_config' in group_names and not openshift.common.is_containerized)
+
 # The cli image is used by openshift_docker_facts to determine the currently installed
 # version.  We need to explicitly pull the latest image to handle cases where
 # the locally cached 'latest' tag is older the g_new_version.