lp://staging/~tribaal/charms/trusty/landscape-client/landscape-client-multiple-juju-files

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://staging/charms/trusty/landscape-client

Adam Collard (community): Needs Fixing on 2014-06-12

Landscape: Pending requested 2014-06-12

Diff: 221 lines (+69/-20)

3 files modified

hooks/common.py (+14/-3)
hooks/hooks.py (+27/-11)
hooks/test_hooks.py (+28/-6)

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-12

Fixed typoes and stray whitespace

43. By Chris Glass on 2014-06-12

As suggested, try to create the dir anyway and catch OSError

42. By Chris Glass on 2014-06-12

Made the relation-departed hook tests leaner.

41. By Chris Glass on 2014-06-12

Fixing hooks tests exposed some problems with the code.

40. By Chris Glass on 2014-06-12

Made the charm output juju info in a JSON file in the juju-info.d/ subdirectory
of the ata dir instead of in a juju-info.json file.

39. By Chris Glass on 2014-05-30

Merge trunk

38. By Björn Tillenius on 2014-05-09

Merged apt-retry [r=tribaal,davidpbritton].

Retry apt-get if the lock can't be aquired. If we get an error from
apt-get we'll retry for 5 minutes.

Currently the code retries on any error, since I couldn't see an
easy way of checking for locking errors only.

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.