Merge lp://staging/~bjornt/charms/precise/landscape-client/relation-depart-no-register into lp://staging/charms/landscape-client
Proposed by
Björn Tillenius
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 35 | ||||
Proposed branch: | lp://staging/~bjornt/charms/precise/landscape-client/relation-depart-no-register | ||||
Merge into: | lp://staging/charms/landscape-client | ||||
Diff against target: |
311 lines (+129/-59) 2 files modified
hooks/hooks.py (+56/-18) hooks/test_hooks.py (+73/-41) |
||||
To merge this branch: | bzr merge lp://staging/~bjornt/charms/precise/landscape-client/relation-depart-no-register | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Adam Collard (community) | Approve | ||
Chris Glass | Approve | ||
Review via email:
|
Description of the change
Clear relation data when departing the relation.
Delete all data related to the container relation when departing it. The
computer title and the juju info file contains information about the remote
unit that landscape-client is related to. If the relation is removed, that
information is not valid anymore and should be removed.
This prevents the client from trying to register again when the config-changed
hook is run, which can happen when services are destroyed.
I also changed the way hooks are run, so that tests and the real Juju process
runs hooks the same way.
To post a comment you must log in.
Can you please mark the RV issue as not being private? I should be able to see the feedback on there without auth-ing.
Few comments on RV, overall looks OK, but I'd like to look again before it gets landed, so marking as Needs Fixing.