Change upgrade playbooks to use 4.0

playbooks/byo/openshift-cluster/upgrades/README.md

@@ -4,4 +4,4 @@ cluster. Additional notes for the associated upgrade playbooks are
 provided in their respective directories.
 
 # Upgrades available
-- [OpenShift Container Platform 3.10 to 3.11](v3_11/README.md) (upgrade OpenShift Origin from 3.10.x to 3.11.x)
+- [OpenShift Container Platform 3.11 to 4.0](v4_0/README.md) (upgrade OpenShift Origin from 3.10.x to 3.11.x)

playbooks/byo/openshift-cluster/upgrades/v3_11/README.md

@@ -16,5 +16,5 @@ This playbook currently performs the following steps.
 ## Usage
 
 ```
-ansible-playbook -i ~/ansible-inventory openshift-ansible/playbooks/byo/openshift-cluster/upgrades/v3_11/upgrade.yml
+ansible-playbook -i ~/ansible-inventory openshift-ansible/playbooks/byo/openshift-cluster/upgrades/v4_0/upgrade.yml
 ```

playbooks/byo/openshift-cluster/upgrades/v3_11/upgrade.yml

@@ -2,4 +2,4 @@
 #
 # Full Control Plane + Nodes Upgrade
 #
-- import_playbook: ../../../../common/openshift-cluster/upgrades/v3_11/upgrade.yml
+- import_playbook: ../../../../common/openshift-cluster/upgrades/v4_0/upgrade.yml

playbooks/byo/openshift-cluster/upgrades/v3_11/upgrade_control_plane.yml

@@ -11,6 +11,6 @@
 #
 # You can run the upgrade_nodes.yml playbook after this to upgrade these components separately.
 #
-- import_playbook: ../../../../common/openshift-cluster/upgrades/v3_11/upgrade_control_plane.yml
+- import_playbook: ../../../../common/openshift-cluster/upgrades/v4_0/upgrade_control_plane.yml
 
 - import_playbook: ../../../../openshift-master/private/restart.yml

playbooks/byo/openshift-cluster/upgrades/v3_11/upgrade_nodes.yml

@@ -4,4 +4,4 @@
 #
 # Upgrades nodes only, but requires the control plane to have already been upgraded.
 #
-- import_playbook: ../../../../common/openshift-cluster/upgrades/v3_11/upgrade_nodes.yml
+- import_playbook: ../../../../common/openshift-cluster/upgrades/v4_0/upgrade_nodes.yml

playbooks/common/openshift-cluster/upgrades/v3_11/upgrade_control_plane_part2.yml

@@ -18,13 +18,13 @@
     l_base_packages_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"
     l_upgrade_cert_check_hosts: "oo_masters_to_config:oo_etcd_to_config"
 
-- name: Configure the upgrade target for the common upgrade tasks 3.11
+- name: Configure the upgrade target for the common upgrade tasks 4.0
   hosts: oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config
   tasks:
   - set_fact:
-      openshift_upgrade_target: '3.11'
-      openshift_upgrade_min: '3.10'
-      openshift_release: '3.11'
+      openshift_upgrade_target: '4.0'
+      openshift_upgrade_min: '3.11'
+      openshift_release: '4.0'
 
 - import_playbook: ../pre/config.yml
   # These vars a meant to exclude oo_nodes from plays that would otherwise include
@@ -87,7 +87,7 @@
 
 - import_playbook: ../upgrade_control_plane.yml
   vars:
-    openshift_release: '3.11'
+    openshift_release: '4.0'
 
 - name: Update master nodes
   hosts: oo_masters
@@ -116,16 +116,3 @@
   - import_role:
       name: openshift_web_console
       tasks_from: remove_old_asset_config.yml
-
-# This is a one time migration. No need to save it in the 3.11.
-# https://bugzilla.redhat.com/show_bug.cgi?id=1565736
-- hosts: oo_first_master
-  tasks:
-  - import_role:
-      name: openshift_hosted
-      tasks_from: registry_service_account.yml
-    when: openshift_hosted_manage_registry | default(True) | bool
-  - import_role:
-      name: openshift_hosted
-      tasks_from: remove_legacy_env_variables.yml
-    when: openshift_hosted_manage_registry | default(True) | bool

playbooks/common/openshift-cluster/upgrades/v3_11/upgrade_nodes.yml

@@ -12,9 +12,9 @@
   hosts: oo_all_hosts
   tasks:
   - set_fact:
-      openshift_upgrade_target: '3.11'
-      openshift_upgrade_min: '3.10'
-      openshift_release: '3.11'
+      openshift_upgrade_target: '4.0'
+      openshift_upgrade_min: '3.11'
+      openshift_release: '4.0'
 
 - import_playbook: ../pre/config.yml
   vars:

playbooks/gcp/openshift-cluster/upgrade.yml

@@ -11,4 +11,4 @@
       all_nodes: true
 
 - name: run the upgrade
-  import_playbook: ../../common/openshift-cluster/upgrades/v3_11/upgrade.yml
+  import_playbook: ../../common/openshift-cluster/upgrades/v4_0/upgrade.yml