Fixes for non-containerized separate etcd hosts.

playbooks/common/openshift-cluster/initialize_facts.yml

@@ -10,3 +10,6 @@
         hostname: "{{ openshift_hostname | default(None) }}"
   - set_fact:
       openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}"
+  - set_fact:
+      repoquery_cmd: "{{ 'dnf repoquery --latest-limit 1 -d 0' if ansible_pkg_mgr == 'dnf' else 'repoquery' }}"
+

playbooks/common/openshift-cluster/upgrades/docker/upgrade_check.yml

@@ -47,5 +47,5 @@
 - name: Flag to delete all images prior to upgrade if crossing Docker 1.10 boundary
   set_fact:
       docker_upgrade_nuke_images: True
-  when: docker_upgrade_nuke_images is not defined and curr_docker_version.stdout | version_compare('1.10','<') and docker_version | version_compare('1.10','>=')
+  when: l_docker_upgrade | bool and docker_upgrade_nuke_images is not defined and curr_docker_version.stdout | version_compare('1.10','<') and docker_version | version_compare('1.10','>=')
 

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

@@ -5,7 +5,7 @@
 
 - include: ../../initialize_facts.yml
 
-- name: Update repos
+- name: Update repos and initialize facts on all hosts
   hosts: oo_masters_to_config:oo_nodes_to_config:oo_etcd_to_config:oo_lb_to_config
   roles:
   - openshift_repos
@@ -165,9 +165,6 @@
       docker pull {{ openshift.common.cli_image }}:{{ openshift_image_tag }}
     when: openshift.common.is_containerized | bool
 
-  - set_fact:
-      repoquery_cmd: "{{ 'dnf repoquery --latest-limit 1 -d 0' if ansible_pkg_mgr == 'dnf' else 'repoquery' }}"
-
   - name: Check latest available OpenShift RPM version
     command: >
       {{ repoquery_cmd }} --qf '%{version}' "{{ openshift.common.service_type }}"