lp://staging/~tribaal/charms/trusty/landscape-client/additional-logging

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/charms/trusty/landscape-client at revision 40

Free Ekanayaka (community): Approve on 2014-06-23

Adam Collard (community): Approve on 2014-06-20

Diff: 77 lines (+16/-1)

2 files modified

hooks/common.py (+13/-0)
hooks/hooks.py (+3/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

44. By Chris Glass on 2014-06-23

Addressed review comments

43. By Chris Glass on 2014-06-20

Addressed review comments

42. By Chris Glass on 2014-06-17

Missing function call

41. By Chris Glass on 2014-06-17

Fixed charm typo.

40. By Chris Glass on 2014-06-17

Added more logging to the charm hooks.

39. By Adam Collard on 2014-06-16

Merged landscape-client-multiple-juju-files [r=danilo,tealeg] [f=1325599].

Let the charm output several juju-info JSON files instead of a single file, since the landscape client charm can be deployed to several machines that are "hulk-smashed" together on the same physical machine.

38. By Chris Glass on 2014-06-12

Merge changes from the ~landscape/charms/landscape-client/trunk branch.

37. By Adam Collard on 2014-03-10

Merged ssl-certificate-confusion [r=tribaal,ack] [f=1287711].

Ensure that we always try to decode the base64 encoded ssl key whenever we write the configuration, not just in registration-relation-{joined,changed}

36. By David Britton on 2014-01-28

Merging in 1273788-change-relation-interface [f=1273788] [r=andreas,csmith]

35. By Björn Tillenius on 2013-12-09

Merged relation-depart-no-register [r=adam-collard,tribaal] [f=1255972].

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.