Attempt to cleanup models whether volumes exist or not. #9793
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
Add a test that shows the issue. Use an $or so that we can handle when
the volumes and/or filesystems don't exist as they didn't on models
upgraded from 2.1.
QA steps
See the new test that was added. When the change isn't applied it fails as in bug #1800872.
Documentation changes
None.
Bug reference
https://bugs.launchpad.net/juju/+bug/1800872