lp:~james-page/charm-helpers/fix_canonical_url

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:charm-helpers at revision 64

Charm Helper Maintainers: Pending requested 2013-07-23

Diff: 57 lines (+6/-4)

2 files modified

charmhelpers/contrib/hahelpers/cluster.py (+2/-1)
tests/contrib/hahelpers/test_cluster_utils.py (+4/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

62. By James Page on 2013-07-23

Don't use get_unit_hostname when generating canonical_url - use private-address

61. By James Page on 2013-07-22

[gandelman-a]

contrib.storage.linux.loopback: Fix create_loopback() to actually return full path of new device.

60. By James Page on 2013-07-22

[gandelman-a]

contrib.openstack.context: Add ImageServiceContext() and tests

Update OpenStack templates: Remove whitespace from rendered template.

59. By Matthew Wedgwood on 2013-07-18

Remove all magic from host.py. Resolves #119956

58. By Matthew Wedgwood on 2013-07-18

[michael.nelson] ensure that the /etc/salt dir exists before writing out grains.

When installing only the salt-common lib, the /etc/salt directory is not created (at least with the version I'm using from lamont).

This branch was just going to ensure that the dir exists before it writes out the grains for use in templates...

...but, while QAing this branch on my charm, I came across some changed behaviour in hookenv.relation_get(). When run in the context of no relation, it used to return None, now it returns Serializable(None).

What I was seeing was this http://paste.ubuntu.com/5783035/

So I added a test to demo the issue and fixed it. Just in terms of consistency, I'm not sure whether it's intended that hookenv.unit_get always returns a dict (result of json.loads) rather than a Serializable (when the result isn't None, that is).

Finally, I got sick of waiting for one specific test to finish when doing `make test`, so added `make ftest` for use while developing.

57. By James Page on 2013-07-18

[fixup] Fixup broken test from merge of changes to save_rc_script

56. By James Page on 2013-07-18

[trivial] fixup missing comma from previous merge

55. By James Page on 2013-07-18

Fixup juju-core compatibility in save_rc_script

54. By James Page on 2013-07-16

Tidy flake8 warnings from core packages and associated tests.

These where annoying me on every review I did so I fixed them up.

53. By James Page on 2013-07-16

Add versions for swift/havana.

Add pockets for Havana cloud archive.

Use package to import cloud-archive key.