Fix and reorder control plane service restart. #2637
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
abutcher
reviewed
Oct 20, 2016
| @@ -14,5 +14,3 @@ | |||
| gather_facts: no | |||
| tasks: | |||
| - include_vars: ../../byo/openshift-cluster/cluster_hosts.yml | |||
|
|
|||
| - include: ../../common/openshift-master/restart.yml | |||
There was a problem hiding this comment.
This include should remain here for standalone use of the playbook, right?
There was a problem hiding this comment.
Good thinking yes, thanks.
dgoodwin
force-pushed
the
ctrl-plane-restart
branch
from
c5c7d3b
to
6683da7
Compare
abutcher
reviewed
Oct 21, 2016
| @@ -15,4 +15,4 @@ | |||
| tasks: | |||
| - include_vars: ../../byo/openshift-cluster/cluster_hosts.yml | |||
|
|
|||
| - include: ../../common/openshift-master/restart.yml | |||
| - include: ../../common/openshift-master/restart.yml | |||
There was a problem hiding this comment.
This is a play include so needs to be top level indent-wise.
There was a problem hiding this comment.
Ugh my bad. Updated.
This was missed in the standalone upgrade control plane playbook. However it also looks to be out of order, we should restart before reconciling and upgrading nodes. As such moved the restart directly into the control plane upgrade common code, and placed it before reconciliation.
dgoodwin
force-pushed
the
ctrl-plane-restart
branch
from
6683da7
to
abbeb68
Compare
This was referenced Oct 24, 2016
|
@sdodson fyi this one needs to go in before 3.4 upgrade ideally. |
sdodson
approved these changes
Oct 25, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This was missed in the standalone upgrade control plane playbook.
However it also looks to be out of order, we should restart before
reconciling and upgrading nodes. As such moved the restart directly into
the control plane upgrade common code, and placed it before
reconciliation.