diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-07 08:29:54 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-07 08:29:54 -0800 |
| commit | e9d34dd19d0669bc6670c76c41d8cd60d27a73f5 (patch) | |
| tree | 67ab7f990375a6a25e5380fbf5716496af5d6b5f /playbooks/common/openshift-cluster | |
| parent | 9d866b0ebb3592828902dcffc4492da6531be345 (diff) | |
| parent | c8f30c2469069a09a8874fff1584b3db1dce9b7a (diff) | |
| download | openshift-e9d34dd19d0669bc6670c76c41d8cd60d27a73f5.tar.gz openshift-e9d34dd19d0669bc6670c76c41d8cd60d27a73f5.tar.bz2 openshift-e9d34dd19d0669bc6670c76c41d8cd60d27a73f5.tar.xz openshift-e9d34dd19d0669bc6670c76c41d8cd60d27a73f5.zip | |
Merge pull request #7040 from sdodson/bz1542399
Automatic merge from submit-queue.
Make sure to include upgrade_pre when upgrading master nodes
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1542399
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml index 40e245d75..3c0b72832 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml @@ -311,6 +311,9 @@ post_tasks: - import_role: name: openshift_node + tasks_from: upgrade_pre.yml + - import_role: + name: openshift_node tasks_from: upgrade.yml - import_role: name: openshift_manage_node |