lp:~mew/charm-helpers/lp1202804
- Get this branch:
- bzr branch lp:~mew/charm-helpers/lp1202804
Branch merges
- Jacek Nykis (community): Approve
- Charm Helper Maintainers: Pending requested
-
Diff: 542 lines (+126/-125)11 files modifiedcharmhelpers/contrib/ansible/__init__.py (+2/-2)
charmhelpers/contrib/hahelpers/ceph.py (+4/-1)
charmhelpers/contrib/openstack/templating.py (+1/-1)
charmhelpers/contrib/openstack/utils.py (+3/-0)
charmhelpers/contrib/saltstack/__init__.py (+1/-1)
charmhelpers/core/host.py (+0/-44)
charmhelpers/fetch/__init__.py (+44/-3)
tests/contrib/ansible/test_ansible.py (+3/-5)
tests/contrib/saltstack/test_saltstates.py (+8/-9)
tests/core/test_host.py (+10/-56)
tests/fetch/test_fetch.py (+50/-3)
Branch information
Recent revisions
- 64. By Adam Gandelman
-
[jamespage]
Don't use get_unit_hostname when generating canonical_url - use private-address
- 62. By Matthew Wedgwood
-
[michael.nelson] Namespace the relationship data stored in the salt grains file and make it persistent
- 61. By James Page
-
[gandelman-a]
contrib.
storage. linux.loopback: Fix create_loopback() to actually return full path of new device. - 60. By James Page
-
[gandelman-a]
contrib.
openstack. context: Add ImageServiceCon text() and tests Update OpenStack templates: Remove whitespace from rendered template.
- 58. By Matthew Wedgwood
-
[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.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:charm-helpers