Merge lp://staging/~cprov/charms/trusty/adt-cloud-service/bug-1409763 into lp://staging/~canonical-ci-engineering/charms/trusty/adt-cloud-service/trunk
Status: | Merged |
---|---|
Approved by: | Celso Providelo |
Approved revision: | 3 |
Merged at revision: | 3 |
Proposed branch: | lp://staging/~cprov/charms/trusty/adt-cloud-service/bug-1409763 |
Merge into: | lp://staging/~canonical-ci-engineering/charms/trusty/adt-cloud-service/trunk |
Diff against target: |
44 lines (+16/-7) 2 files modified
hooks/actions.py (+15/-7) hooks/services.py (+1/-0) |
To merge this branch: | bzr merge lp://staging/~cprov/charms/trusty/adt-cloud-service/bug-1409763 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Francis Ginther | Approve | ||
Thomi Richards (community) | Approve | ||
Review via email: mp+253124@code.staging.launchpad.net |
Commit message
Implement a service action for blindly setting existing website relation data because RelationContext
Description of the change
Implement a service action for blindly setting existing website relation data because RelationContext
The side-effect of doing it is that our mojo spec manifest will have to deploy services, deploy relations and then deploy services again (so the action will be triggered when there is already an established relation) ... odd, but will work until the before mentioned bug gets fixed on charmhelpers.
That's what we get for using cutting-edge nice features :-(
LGTM