Remove double_upgrade bits

This commit removes remaining now-unused double_upgrade tasks
and variables.

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

@@ -50,10 +50,6 @@
     # openshift_protect_installed_version is passed n via upgrade_control_plane.yml
     # l_openshift_version_set_hosts is passed via upgrade_control_plane.yml
 
-# version_override will set various version-related variables during a double upgrade.
-- import_playbook: version_override.yml
-  when: l_double_upgrade_cp | default(False)
-
 - import_playbook: verify_cluster.yml
 
 # If we're only upgrading nodes, we need to ensure masters are already upgraded

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

@@ -1,28 +0,0 @@
----
-# This playbook overrides normal version setting during double upgrades.
-
-- name: Set proper version values for upgrade
-  hosts: "{{ l_version_override_hosts | default('all:!all') }}"
-  tasks:
-    - set_fact:
-        # All of these will either have been set by openshift_version or
-        # provided by the user; we need to save these for later.
-        l_double_upgrade_saved_version: "{{ openshift_version }}"
-        l_double_upgrade_saved_release: "{{ openshift_release | default(openshift_upgrade_target) }}"
-        l_double_upgrade_saved_tag: "{{ openshift_image_tag }}"
-        l_double_upgrade_saved_pkgv: "{{ openshift_pkg_version }}"
-    - set_fact:
-        # We already ran openshift_version for the second of two upgrades;
-        # here we need to set some variables to enable the first upgrade.
-        # openshift_version, openshift_image_tag, and openshift_pkg_version
-        # will be modified by openshift_version; we want to ensure these
-        # are initially set to first versions to ensure no accidental usage of
-        # second versions (eg, 3.8 and 3.9 respectively) are used.
-        openshift_version: "{{ l_double_upgrade_first_version }}"
-        openshift_release: "{{ l_double_upgrade_first_release }}"
-        openshift_upgrade_target: '3.8'
-        openshift_upgrade_min: '3.7'
-
-# Now that we have force-set a different version, we need to update a few things
-# to ensure we have settings that actually match what's in repos/registries.
-- import_playbook: ../../../../init/version.yml

playbooks/openshift-master/private/upgrade.yml

@@ -190,9 +190,7 @@
     when: reconcile_failed | length > 0
 
 - name: Drain and upgrade master nodes
-  # There is no need to update nodes in the middle of double upgrade
-  # This would skip node update to 3.8 during 3.7->3.9 upgrade
-  hosts: "{{ l_double_upgrade_cp | default(False) | ternary('all:!all', 'oo_masters_to_config:&oo_nodes_to_upgrade') }}"
+  hosts: oo_masters_to_config:&oo_nodes_to_upgrade
   # This var must be set with -e on invocation, as it is not a per-host inventory var
   # and is evaluated early. Values such as "20%" can also be used.
   serial: "{{ openshift_upgrade_control_plane_nodes_serial | default(1) }}"