Merge lp://qastaging/~project-calico/charm-helpers/liberty2 into lp://qastaging/charm-helpers
Proposed by
Nell Jerram
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~project-calico/charm-helpers/liberty2 |
| Merge into: | lp://qastaging/charm-helpers |
| Diff against target: |
39 lines (+15/-9) 1 file modified
charmhelpers/contrib/openstack/neutron.py (+15/-9) |
| To merge this branch: | bzr merge lp://qastaging/~project-calico/charm-helpers/liberty2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
Add support for Calico networking with OpenStack Liberty release.
Specifically, with Liberty we use a Calico-specific DHCP agent instead of the Neutron reference DHCP agent. Therefore we install an additional package, calico-dhcp-agent, and manage the 'calico-dhcp-agent' service instead of 'neutron-
To post a comment you must log in.
Revision history for this message
| Nell Jerram (neil-jerram) wrote | # |
Unmerged revisions
- 539. By Nell Jerram
-
Changes for Calico networking with OpenStack Liberty
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This merge request replaces https:/