Merge lp://staging/~openstack-charmers/charms/precise/nova-cloud-controller/ods_merge into lp://staging/~charmers/charms/precise/nova-cloud-controller/trunk
Proposed by
Adam Gandelman
| Status: | Merged |
|---|---|
| Merged at revision: | 56 |
| Proposed branch: | lp://staging/~openstack-charmers/charms/precise/nova-cloud-controller/ods_merge |
| Merge into: | lp://staging/~charmers/charms/precise/nova-cloud-controller/trunk |
| Diff against target: |
1536 lines (+596/-100) 23 files modified
charm-helpers.yaml (+0/-1) config.yaml (+29/-0) hooks/charmhelpers/contrib/openstack/alternatives.py (+17/-0) hooks/charmhelpers/contrib/openstack/context.py (+20/-1) hooks/charmhelpers/contrib/openstack/neutron.py (+20/-0) hooks/charmhelpers/contrib/openstack/utils.py (+81/-10) hooks/charmhelpers/contrib/storage/linux/ceph.py (+27/-3) hooks/charmhelpers/core/hookenv.py (+78/-23) hooks/charmhelpers/core/host.py (+15/-9) hooks/charmhelpers/fetch/__init__.py (+53/-5) hooks/charmhelpers/fetch/bzrurl.py (+1/-1) hooks/nova_cc_context.py (+10/-0) hooks/nova_cc_hooks.py (+59/-29) hooks/nova_cc_utils.py (+32/-2) metadata.yaml (+3/-0) revision (+1/-1) templates/folsom/nova.conf (+14/-0) templates/folsom/quantum-server (+6/-0) templates/havana/neutron-server (+6/-0) templates/havana/nvp.ini (+11/-0) unit_tests/test_nova_cc_hooks.py (+63/-1) unit_tests/test_nova_cc_utils.py (+47/-14) unit_tests/test_utils.py (+3/-0) |
| To merge this branch: | bzr merge lp://staging/~openstack-charmers/charms/precise/nova-cloud-controller/ods_merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Marco Ceppi (community) | Abstain | ||
| OpenStack Charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
* Adds Neutron NVP suppot
* Adds VMware subordinate interface
To post a comment you must log in.
Revision history for this message
| Marco Ceppi (marcoceppi) | # |
review:
Abstain
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
