Allow dump-model to work with incomplete model data #11806
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
howbazaar
approved these changes
Jul 7, 2020
|
|
jujubot
added a commit
that referenced
this pull request
Jul 8, 2020
#11808 Merge from 2.8 to bring forward: - #11807 from manadart/2.8-machiner-lld - #11802 from hpidcock/update-testing-dep - #11806 from wallyworld/dump-model-partial - #11805 from jameinel/2.8-dispatch-relative-1885543 - #11796 from SimonRichardson/model-config-input - #11804 from achilleasa/2.8-manual-provisioning-on-non-amd64-instances-backport - #11800 from wallyworld/vsphere-absolute-vmfolder - #11786 from SimonRichardson/juju-config-new-line
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.
Description of change
juju dump-model errors out if run just after adding a machine or relation, since the machine is still pending and there's no instance data yet, or the relation units are not yet in scope and so relation data is missing.
This PR adds a new IgnoreIncompleteModel bool to export config so that we still get a dumped model output if there's missing data. This is what we want as we only care about complete model data when doing migrations.
QA steps
juju add-machine && juju dump-model
juju deploy foo && juju deploy bar && juju relate foo bar && juju dump-model
Bug reference
https://bugs.launchpad.net/bugs/1849746
https://bugs.launchpad.net/bugs/1886369