Browse Source

Remove 3.10 upgrade playbooks

Russell Teague 6 years ago
parent
commit
73f6568efc

+ 1 - 1
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.9 to 3.10](v3_10/README.md) (upgrade OpenShift Origin from 3.9.x to 3.10.x)
+- [OpenShift Container Platform 3.10 to 3.11](v3_11/README.md) (upgrade OpenShift Origin from 3.10.x to 3.11.x)

+ 0 - 20
playbooks/byo/openshift-cluster/upgrades/v3_10/README.md

@@ -1,20 +0,0 @@
-# v3.10 Major and Minor Upgrade Playbook
-
-## Overview
-This playbook currently performs the following steps.
-
- * Upgrade and restart master services
- * Unschedule node
- * Upgrade and restart docker
- * Upgrade and restart node services
- * Modifies the subset of the configuration necessary
- * Applies the latest cluster policies
- * Updates the default router if one exists
- * Updates the default registry if one exists
- * Updates image streams and quickstarts
-
-## Usage
-
-```
-ansible-playbook -i ~/ansible-inventory openshift-ansible/playbooks/byo/openshift-cluster/upgrades/v3_10/upgrade.yml
-```

+ 0 - 5
playbooks/byo/openshift-cluster/upgrades/v3_10/upgrade.yml

@@ -1,5 +0,0 @@
----
-#
-# Full Control Plane + Nodes Upgrade
-#
-- import_playbook: ../../../../common/openshift-cluster/upgrades/v3_10/upgrade.yml

+ 0 - 16
playbooks/byo/openshift-cluster/upgrades/v3_10/upgrade_control_plane.yml

@@ -1,16 +0,0 @@
----
-#
-# Control Plane Upgrade Playbook
-#
-# Upgrades masters and Docker (only on standalone etcd hosts)
-#
-# This upgrade does not include:
-# - node service running on masters
-# - docker running on masters
-# - node service running on dedicated nodes
-#
-# You can run the upgrade_nodes.yml playbook after this to upgrade these components separately.
-#
-- import_playbook: ../../../../common/openshift-cluster/upgrades/v3_10/upgrade_control_plane.yml
-
-- import_playbook: ../../../../openshift-master/private/restart.yml

+ 0 - 7
playbooks/byo/openshift-cluster/upgrades/v3_10/upgrade_nodes.yml

@@ -1,7 +0,0 @@
----
-#
-# Node Upgrade Playbook
-#
-# Upgrades nodes only, but requires the control plane to have already been upgraded.
-#
-- import_playbook: ../../../../common/openshift-cluster/upgrades/v3_10/upgrade_nodes.yml

+ 0 - 7
playbooks/byo/openshift-cluster/upgrades/v3_10/upgrade_scale_groups.yml

@@ -1,7 +0,0 @@
----
-#
-# Node Scale Group Upgrade Playbook
-#
-# Upgrades scale group nodes only.
-#
-- import_playbook: ../../../../common/openshift-cluster/upgrades/upgrade_scale_group.yml

+ 0 - 13
playbooks/common/openshift-cluster/upgrades/v3_10/label_nodes.yml

@@ -1,13 +0,0 @@
----
-
-- name: Set node schedulability
-  hosts: oo_masters_to_config
-  roles:
-    - openshift_facts
-    - lib_openshift
-  tasks:
-    - import_role:
-        name: openshift_manage_node
-        tasks_from: config.yml
-      vars:
-        openshift_master_host: '{{ groups.oo_first_master.0 }}'

+ 0 - 1
playbooks/common/openshift-cluster/upgrades/v3_10/master_config_upgrade.yml

@@ -1 +0,0 @@
----

+ 0 - 1
playbooks/common/openshift-cluster/upgrades/v3_10/roles

@@ -1 +0,0 @@
-../../../../../roles/

+ 0 - 7
playbooks/common/openshift-cluster/upgrades/v3_10/upgrade.yml

@@ -1,7 +0,0 @@
----
-#
-# Full Control Plane + Nodes Upgrade
-#
-- import_playbook: upgrade_control_plane.yml
-
-- import_playbook: upgrade_nodes.yml

+ 0 - 121
playbooks/common/openshift-cluster/upgrades/v3_10/upgrade_control_plane.yml

@@ -1,121 +0,0 @@
----
-#
-# Control Plane Upgrade Playbook
-#
-# Upgrades masters and Docker (only on standalone etcd hosts)
-#
-# This upgrade does not include:
-# - node service running on masters
-# - docker running on masters
-# - node service running on dedicated nodes
-#
-# You can run the upgrade_nodes.yml playbook after this to upgrade these components separately.
-#
-- import_playbook: ../init.yml
-  vars:
-    l_upgrade_no_switch_firewall_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"
-    l_init_fact_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config:oo_nodes_to_config"
-    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.10
-  hosts: oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config
-  tasks:
-  - set_fact:
-      openshift_upgrade_target: '3.10'
-      openshift_upgrade_min: '3.9'
-      openshift_release: '3.10'
-
-- import_playbook: ../pre/config.yml
-  # These vars a meant to exclude oo_nodes from plays that would otherwise include
-  # them by default.
-  vars:
-    l_openshift_version_set_hosts: "oo_etcd_to_config:oo_masters_to_config:!oo_first_master"
-    l_upgrade_repo_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"
-    l_upgrade_no_proxy_hosts: "oo_masters_to_config"
-    l_upgrade_health_check_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"
-    l_upgrade_verify_targets_hosts: "oo_masters_to_config"
-    l_upgrade_docker_target_hosts: "oo_masters_to_config:oo_etcd_to_config"
-    l_upgrade_excluder_hosts: "oo_masters_to_config"
-    openshift_protect_installed_version: False
-
-# Need to run sanity checks after version has been run.
-- import_playbook: ../../../../init/sanity_checks.yml
-  vars:
-    # oo_lb_to_config might not be present; Can't use !oo_nodes because masters are nodes.
-    l_sanity_check_hosts: "{{ groups['oo_etcd_to_config'] | union(groups['oo_masters_to_config']) | union(groups['oo_lb_to_config'] | default([]) ) }}"
-
-- name: Flag pre-upgrade checks complete for hosts without errors
-  hosts: oo_masters_to_config:oo_etcd_to_config
-  tasks:
-  - set_fact:
-      pre_upgrade_complete: True
-
-- import_playbook: label_nodes.yml
-
-# To upgrade, we need masters to be capable of signing certificates
-- hosts: oo_masters
-  serial: 1
-  tasks:
-  - name: Enable core bootstrapping components
-    include_tasks: ../../../../openshift-master/private/tasks/enable_bootstrap.yml
-  - name: Place shim commands on the masters before we begin the upgrade
-    import_role:
-      name: openshift_control_plane
-      tasks_from: static_shim.yml
-
-# TODO: need to verify settings about the bootstrap configs
-# 1. Does network policy match the master config
-
-- name: Configure components that must be available prior to upgrade
-  hosts: oo_first_master
-  pre_tasks:
-  - name: Enable core bootstrapping components
-    include_tasks: ../../../../openshift-master/private/tasks/enable_bootstrap_config.yml
-  - name: Ensure the master bootstrap config has bootstrapping config
-    import_role:
-      name: openshift_node_group
-      tasks_from: upgrade.yml
-  - name: Enable node configuration reconciliation
-    import_role:
-      name: openshift_node_group
-      tasks_from: sync.yml
-  roles:
-  - role: openshift_sdn
-    when: openshift_use_openshift_sdn | default(True) | bool
-
-- name: Update master nodes
-  hosts: oo_masters
-  serial: 1
-  tasks:
-  - import_role:
-      name: openshift_node
-      tasks_from: upgrade_pre.yml
-  - import_role:
-      name: openshift_node
-      tasks_from: upgrade.yml
-
-- import_playbook: ../upgrade_control_plane.yml
-  vars:
-    openshift_release: '3.10'
-
-- import_playbook: ../post_control_plane.yml
-
-- hosts: oo_masters
-  tasks:
-  - 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

+ 0 - 40
playbooks/common/openshift-cluster/upgrades/v3_10/upgrade_nodes.yml

@@ -1,40 +0,0 @@
----
-#
-# Node Upgrade Playbook
-#
-# Upgrades nodes only, but requires the control plane to have already been upgraded.
-#
-- import_playbook: ../init.yml
-  vars:
-    l_upgrade_cert_check_hosts: "oo_nodes_to_config"
-
-- name: Configure the upgrade target for the common upgrade tasks
-  hosts: oo_all_hosts
-  tasks:
-  - set_fact:
-      openshift_upgrade_target: '3.10'
-      openshift_upgrade_min: '3.9'
-      openshift_release: '3.10'
-
-- import_playbook: ../pre/config.yml
-  vars:
-    l_upgrade_repo_hosts: "oo_nodes_to_config"
-    l_upgrade_no_proxy_hosts: "oo_all_hosts"
-    l_upgrade_health_check_hosts: "oo_nodes_to_config"
-    l_upgrade_verify_targets_hosts: "oo_nodes_to_config"
-    l_upgrade_docker_target_hosts: "oo_nodes_to_config"
-    l_upgrade_excluder_hosts: "oo_nodes_to_config:!oo_masters_to_config"
-    l_upgrade_nodes_only: True
-
-# Need to run sanity checks after version has been run.
-- import_playbook: ../../../../init/sanity_checks.yml
-
-- name: Flag pre-upgrade checks complete for hosts without errors
-  hosts: oo_masters_to_config:oo_nodes_to_upgrade:oo_etcd_to_config
-  tasks:
-  - set_fact:
-      pre_upgrade_complete: True
-
-# Pre-upgrade completed
-
-- import_playbook: ../upgrade_nodes.yml

+ 1 - 1
playbooks/gcp/openshift-cluster/upgrade.yml

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