Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Run storage upgrade pre and post master upgrade #4476

Merged
merged 1 commit into from
Jun 19, 2017
Merged

Run storage upgrade pre and post master upgrade #4476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
# Upgrade Masters
###############################################################################

# oc adm migrate storage should be run prior to etcd v3 upgrade
# See: https://github.com/openshift/origin/pull/14625#issuecomment-308467060
- name: Pre master upgrade - Upgrade job storage
hosts: oo_first_master
tasks:
- name: Upgrade job storage
command: >
{{ openshift.common.client_binary }} adm --config={{ openshift.common.config_base }}/master/admin.kubeconfig
migrate storage --confirm

# If facts cache were for some reason deleted, this fact may not be set, and if not set
# it will always default to true. This causes problems for the etcd data dir fact detection
# so we must first make sure this is set correctly before attempting the backup.
Expand Down Expand Up @@ -133,6 +143,14 @@
- set_fact:
master_update_complete: True

- name: Post master upgrade - Upgrade job storage
hosts: oo_first_master
tasks:
- name: Upgrade job storage
command: >
{{ openshift.common.client_binary }} adm --config={{ openshift.common.config_base }}/master/admin.kubeconfig
migrate storage --confirm

##############################################################################
# Gate on master update complete
##############################################################################
Expand Down
18 changes: 0 additions & 18 deletions playbooks/common/openshift-cluster/upgrades/v3_5/storage_upgrade.yml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions playbooks/common/openshift-cluster/upgrades/v3_5/upgrade.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,5 +115,3 @@
- include: ../upgrade_nodes.yml

- include: ../post_control_plane.yml

- include: storage_upgrade.yml
2 changes: 0 additions & 2 deletions playbooks/common/openshift-cluster/upgrades/v3_5/upgrade_control_plane.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,5 +119,3 @@
master_config_hook: "v3_5/master_config_upgrade.yml"

- include: ../post_control_plane.yml

- include: storage_upgrade.yml
18 changes: 0 additions & 18 deletions playbooks/common/openshift-cluster/upgrades/v3_6/storage_upgrade.yml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions playbooks/common/openshift-cluster/upgrades/v3_6/upgrade.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,5 +115,3 @@
- include: ../upgrade_nodes.yml

- include: ../post_control_plane.yml

- include: storage_upgrade.yml
2 changes: 0 additions & 2 deletions playbooks/common/openshift-cluster/upgrades/v3_6/upgrade_control_plane.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,5 +119,3 @@
master_config_hook: "v3_6/master_config_upgrade.yml"

- include: ../post_control_plane.yml

- include: storage_upgrade.yml