Merge lp://qastaging/~chad.smith/charms/precise/block-storage-broker/bsb-use-charmhelpers-to-set-openstack-origin into lp://qastaging/charms/block-storage-broker
| Status: | Work in progress | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://qastaging/~chad.smith/charms/precise/block-storage-broker/bsb-use-charmhelpers-to-set-openstack-origin | ||||
| Merge into: | lp://qastaging/charms/block-storage-broker | ||||
| Diff against target: |
3846 lines (+3261/-146) 23 files modified
Makefile (+10/-7) charm-helpers.yaml (+2/-0) config.yaml (+15/-0) hooks/charmhelpers/contrib/openstack/alternatives.py (+17/-0) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+61/-0) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+275/-0) hooks/charmhelpers/contrib/openstack/context.py (+789/-0) hooks/charmhelpers/contrib/openstack/ip.py (+79/-0) hooks/charmhelpers/contrib/openstack/neutron.py (+201/-0) hooks/charmhelpers/contrib/openstack/templates/__init__.py (+2/-0) hooks/charmhelpers/contrib/openstack/templating.py (+279/-0) hooks/charmhelpers/contrib/openstack/utils.py (+459/-0) hooks/charmhelpers/contrib/storage/linux/ceph.py (+387/-0) hooks/charmhelpers/contrib/storage/linux/loopback.py (+62/-0) hooks/charmhelpers/contrib/storage/linux/lvm.py (+88/-0) hooks/charmhelpers/contrib/storage/linux/utils.py (+53/-0) hooks/charmhelpers/core/hookenv.py (+129/-6) hooks/charmhelpers/core/host.py (+81/-12) hooks/charmhelpers/fetch/__init__.py (+191/-74) hooks/charmhelpers/fetch/archiveurl.py (+56/-1) hooks/charmhelpers/fetch/bzrurl.py (+2/-1) hooks/hooks.py (+4/-4) hooks/test_hooks.py (+19/-41) |
||||
| To merge this branch: | bzr merge lp://qastaging/~chad.smith/charms/precise/block-storage-broker/bsb-use-charmhelpers-to-set-openstack-origin | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| David Britton (community) | Needs Fixing | ||
|
Review via email:
|
|||
Description of the change
This branch avoids making a static call to charmhelpers' fetch.add_
This branch is quite sizeable because of pulling in the charmhelpers.
1. sync new charmhelpers dependencies
- minor Makefile sync target added for simplified charmhelper updates
- charm-helpers.yaml to define new charmhelpers dependencies contrib.openstack and contrib.storage
- new files sync'd under charmhelpers (not authored in this branch)
2. config.yaml has a new openstack-origin parameter that will default the cloud archive repository to the supported distro default but will allow a user to set their own custom cloud archive repository if needed
3. hooks/hooks.py drop use of fetch.add_
4. fix unit tests
The relevant changes that exclude the charmhelpers.
http://
Unmerged revisions
- 62. By Chad Smith
-
merge block-storage-
broker trunk resolve conflicts and fix unit tests to avoid mocker use - 61. By Chad Smith
-
correct yaml indent in config.yaml
- 60. By Chad Smith
-
update unit tests to validate use of charmhelpers config_
installation_ source - 59. By Chad Smith
-
update charmhelpers sync functionality
- 58. By Chad Smith
-
add openstack-origin to config.yaml options and use charmhelpers configure_
installation_ source to pull appropriate deb packages for a given ubuntu series - 57. By Chad Smith
-
sync added contrib.
(storage| openstack) files - 56. By Chad Smith
-
add contrib.openstack and it's dependency contrib.storage to charm-helpers.yaml file
- 55. By Chad Smith
-
sync existing charmhelpers dependencies
Hi Chad -- Thanks for this MP!
I don't see any reason why this would be controversial, please clear the merge conflict with trunk and I'll review and commit this straightaway.