Merge 2.7 into develop #11440
Merged
Merge 2.7 into develop #11440
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
We no longer cache them in the datastore, instead they're used to create a template VM that new VMs are cloned from. This deletion is causing problems because if the user doesn't have access to the datastore it fails and blocks controller teardown.
juju#11439 ### Checklist - [ ] Checked if it requires a [pylibjuju](https://github.com/juju/python-libjuju) change? - [ ] Added [integration tests](https://github.com/juju/juju/tree/develop/tests) for the PR? - [ ] Added or updated [doc.go](https://discourse.jujucharms.com/t/readme-in-packages/451) related to packages changed? - [ ] Do comments answer the question of why design decisions were made? ---- ## Description of change This is vestigial code that should have been removed a while ago - we no longer cache VMDKs in the datastore, instead they're used to create a template VM that new VMs are cloned from. This deletion is causing problems if the user doesn't have access to the datastore - in that case it fails and blocks controller teardown. ## QA steps Bootstrap a vsphere controller. Tear it down with `--debug` - there shouldn't be any logging from `juju.provider.vmware` about deleting from datastores. ## Documentation changes None ## Bug reference https://bugs.launchpad.net/juju/+bug/1872552
wallyworld
approved these changes
Apr 14, 2020
|
|
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
This brings the vsphere change from #11439 into the develop branch. No conflicts.
QA steps
Bootstrap on vsphere, destroy the controller with
--debug- there shouldn't be any logging about deleting files from datastores.Documentation changes
None
Bug reference
None