Merge lp://qastaging/~james-page/charms/quantal/nova-cloud-controller/quantum-support into lp://qastaging/~charmers/charms/precise/nova-cloud-controller/trunk
Proposed by
James Page
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merge reported by: | Adam Gandelman | ||||
| Merged at revision: | not available | ||||
| Proposed branch: | lp://qastaging/~james-page/charms/quantal/nova-cloud-controller/quantum-support | ||||
| Merge into: | lp://qastaging/~charmers/charms/precise/nova-cloud-controller/trunk | ||||
| Diff against target: |
793 lines (+564/-16) 10 files modified
config.yaml (+51/-1) files/create_ext_net.py (+122/-0) files/create_tenant_net.py (+143/-0) hooks/lib/nova/folsom (+31/-7) hooks/lib/nova/nova-common (+18/-1) hooks/lib/openstack-common (+22/-0) hooks/nova-cloud-controller-common (+40/-0) hooks/nova-cloud-controller-relations (+134/-6) metadata.yaml (+2/-0) revision (+1/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~james-page/charms/quantal/nova-cloud-controller/quantum-support | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Adam Gandelman | Pending | ||
| charmers | Pending | ||
|
Review via email:
|
|||
Commit message
Add support for Quantum API Server
Description of the change
This merge adds support for Quantum to the nova-cloud-
This is provides as an extra option for network-manager; The Quantum API server is setup and configured on the cloud controller node alongside the Nova API servers.
At the moment only the OpenvSwitch plugin for quantum is supported; however the integration is written in such a way that its possible to add support for other options later on.
These changes rely on lp:~james-page/charms/precise/mysql/shared-db-multi which is currently proposed for merge.
To post a comment you must log in.
Revision history for this message
| Adam Gandelman (gandelman-a) wrote | # |
Revision history for this message
| Adam Gandelman (gandelman-a) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This looks good for the most part. There are some issues I found elsewhere outlined in the quantum-gateway bug. I'll merge this when the changes are ready for merging into nova-compute.