Let the operator manage openshift updates and upgrades
This remove the upgrade code to ensure that TripleO will not get involved in the business of updating and upgrading OpenShift clusters as it currently involved manual steps for clusters using glusterfs. Instead, the operator is invited to upgrade OpenShift separately from TripleO and follow the OpenShift upgrade documentation. [1] https://docs.openshift.com/container-platform/3.11/upgrading/automated_upgrades.html#special-considerations-for-glusterfs [2] https://docs.openshift.com/container-platform/3.11/upgrading/automated_upgrades.html Change-Id: I6033525cde40fd44d648cef792efbca6901e88f0 Closes-Bug: #1810812
This commit is contained in:
parent
950640ad52
commit
97cf1c274a
@ -59,10 +59,6 @@ parameters:
|
||||
default: '/usr/share/ansible/openshift-ansible/playbooks/openshift-node/scaleup.yml'
|
||||
description: Path to OpenShift-Ansible node scale-up playbook.
|
||||
type: string
|
||||
OpenShiftUpgradePlaybook:
|
||||
default: '/usr/share/ansible/openshift-ansible/playbooks/byo/openshift-cluster/upgrades/v3_11/upgrade.yml'
|
||||
description: Path to OpenShift-Ansible Upgrade playbook.
|
||||
type: string
|
||||
OpenShiftGlobalVariables:
|
||||
default: {}
|
||||
description: Global Ansible variables for OpenShift-Ansible installer.
|
||||
@ -300,7 +296,6 @@ outputs:
|
||||
openshift_master_scaleup_playbook_path: {get_param: OpenShiftMasterScaleupPlaybook}
|
||||
openshift_etcd_scaleup_playbook_path: {get_param: OpenShiftEtcdScaleupPlaybook}
|
||||
openshift_worker_scaleup_playbook_path: {get_param: OpenShiftWorkerScaleupPlaybook}
|
||||
openshift_upgrade_playbook_path: {get_param: OpenShiftUpgradePlaybook}
|
||||
openshift_ansible_image: {get_param: DockerOpenShiftAnsibleImage}
|
||||
|
||||
# NOTE(flaper87): We'll use openshift_ansible_scaleup_playbook_path
|
||||
@ -359,10 +354,6 @@ outputs:
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% if tripleo_stack_action == 'UPDATE' and openshift_upgrade is defined and openshift_upgrade %}
|
||||
- include: "{{openshift_upgrade_playbook_path}}"
|
||||
{% endif %}
|
||||
|
||||
{% if tripleo_stack_action == 'CREATE' or (tripleo_stack_action == 'UPDATE' and has_new_nodes) %}
|
||||
- include: "{{openshift_ansible_playbook_path}}"
|
||||
{% endif %}
|
||||
@ -529,11 +520,3 @@ outputs:
|
||||
shell: |
|
||||
{{openshift_command}} 2>&1 | tee {{playbook_dir}}/openshift/playbook-validation.log
|
||||
exit ${PIPESTATUS[0]}
|
||||
|
||||
external_upgrade_tasks:
|
||||
- when: step|int == 0
|
||||
tags: openshift
|
||||
block:
|
||||
- name: set OpenShift upgrade facts
|
||||
set_fact:
|
||||
openshift_upgrade: true
|
||||
|
Loading…
x
Reference in New Issue
Block a user