qa/tasks/cephadm: Add check for already set image#35287
Merged
sebastian-philipp merged 1 commit intoceph:masterfrom May 29, 2020
Merged
qa/tasks/cephadm: Add check for already set image#35287sebastian-philipp merged 1 commit intoceph:masterfrom
sebastian-philipp merged 1 commit intoceph:masterfrom
Conversation
sebastian-philipp
suggested changes
May 28, 2020
6776635 to
3678c53
Compare
sebastian-philipp
approved these changes
May 28, 2020
3678c53 to
18c5187
Compare
qa/tasks/cephadm.py
Outdated
|
|
||
| # image | ||
| ctx.ceph[cluster_name].image = config.get('image') | ||
| if not hasattr(ctx.ceph[cluster_name].image, 'image'): |
Contributor
There was a problem hiding this comment.
Suggested change
| if not hasattr(ctx.ceph[cluster_name].image, 'image'): | |
| if not hasattr(ctx.ceph[cluster_name], 'image'): |
?
Adding a check for already bootstrapped clusters where the image is already set to avoid overriding it. Signed-off-by: Georgios Kyratsas <gkyratsas@suse.com>
18c5187 to
fabcbea
Compare
Contributor
Author
|
hmm I tested it on top of master and it was successful. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Moving image instantiation to initialize_config() function because it overrides the image in already bootstrapped clusters
Signed-off-by: Georgios Kyratsas gkyratsas@suse.com
Checklist
Show available Jenkins commands
jenkins retest this pleasejenkins test classic perfjenkins test crimson perfjenkins test signedjenkins test make checkjenkins test make check arm64jenkins test submodulesjenkins test dashboardjenkins test dashboard backendjenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume tox