Merge lp://qastaging/~dpb/landscape-charm/fix-vhost-config-race into lp://qastaging/~landscape/landscape-charm/stable
Proposed by
David Britton
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | David Britton | ||||
| Approved revision: | 190 | ||||
| Merged at revision: | 161 | ||||
| Proposed branch: | lp://qastaging/~dpb/landscape-charm/fix-vhost-config-race | ||||
| Merge into: | lp://qastaging/~landscape/landscape-charm/stable | ||||
| Diff against target: |
169 lines (+40/-5) 5 files modified
config/landscape-deployments.yaml (+1/-1) hooks/hooks.py (+8/-1) hooks/install (+7/-3) hooks/test_hooks.py (+13/-0) tests/01-begin (+11/-0) |
||||
| To merge this branch: | bzr merge lp://qastaging/~dpb/landscape-charm/fix-vhost-config-race | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Benji York (community) | Approve | ||
| Chris Glass (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Fix for small race where root_url would not be set in certain conditions.
Description of the change
Fix for small race where root_url would not be set in certain conditions. I had a very hard time repeating this, so I added an integration test that would check the state of root_url after the deploy, testing if the fix I put in made the difference. We have nightly tests of these, so I'm hoping that it will show up in nightly testing if not fixed.
to test:
make test
juju env atlas # or something maas related
DEPLOYER_
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Ok, seems to work - could not reproduce the race condition, and the fix seems to be sane so it should at least not introduce complications.
+1