Juju Charms Collection
swift-proxy package

Merge lp://staging/~adam-collard/charms/trusty/swift-proxy/lib-in-python-package into lp://staging/~openstack-charmers-archive/charms/trusty/swift-proxy/next

Proposed by Adam Collard on 2015-09-07

Status:	Merged
Merged at revision:	107
Proposed branch:	lp://staging/~adam-collard/charms/trusty/swift-proxy/lib-in-python-package
Merge into:	lp://staging/~openstack-charmers-archive/charms/trusty/swift-proxy/next
Diff against target:	396 lines (+120/-52) 13 files modified .coveragerc (+1/-0) Makefile (+3/-3) charm-helpers-hooks.yaml (+1/-1) charmhelpers/contrib/openstack/utils.py (+4/-0) charmhelpers/contrib/storage/linux/ceph.py (+2/-11) charmhelpers/core/kernel.py (+68/-0) hooks/swift_hooks.py (+1/-1) lib/swift_context.py (+7/-1) setup.cfg (+1/-1) unit_tests/__init__.py (+0/-2) unit_tests/test_swift_context.py (+7/-7) unit_tests/test_swift_hooks.py (+2/-1) unit_tests/test_swift_utils.py (+23/-24)
To merge this branch:	bzr merge lp://staging/~adam-collard/charms/trusty/swift-proxy/lib-in-python-package
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Chris Glass (community)	2015-09-07	Approve on 2015-09-07
Landscape	2015-09-07	Pending
Review via email: mp+270304@code.staging.launchpad.net

Description of the change

With the addition of actions to the OpenStack charms, there's a need to share code between actions and hooks. This branch moves library code to a top-level ./lib/ and then symlinks that into ./hooks/lib, likewise for charm-helpers.

This should be a plain refactor with no change in behaviour, but laying the ground for an actions/lib symlink and an actions/charm-helpers symlink.

(see https://code.launchpad.net/~adam-collard/charms/precise/swift-storage/lib-in-python-package/+merge/265105 for the equivalent MP for swift-storage)