Merge lp:~james-page/charms/precise/quantum-gateway/ha-fixes into lp:~openstack-charmers/charms/precise/quantum-gateway/ha-support
Proposed by
James Page
Status: | Merged |
---|---|
Approved by: | Adam Gandelman |
Approved revision: | 62 |
Merged at revision: | 53 |
Proposed branch: | lp:~james-page/charms/precise/quantum-gateway/ha-fixes |
Merge into: | lp:~openstack-charmers/charms/precise/quantum-gateway/ha-support |
Diff against target: |
436 lines (+57/-193) 8 files modified
config.yaml (+1/-0) hooks/hooks.py (+34/-53) hooks/quantum_utils.py (+2/-45) hooks/utils.py (+16/-85) metadata.yaml (+1/-7) templates/nova.conf (+1/-1) templates/ovs_quantum_plugin.ini (+1/-1) templates/quantum.conf (+1/-1) |
To merge this branch: | bzr merge lp:~james-page/charms/precise/quantum-gateway/ha-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenStack Charmers | Pending | ||
Review via email: mp+152682@code.launchpad.net |
Description of the change
Quantum has undergone some refactoring upstream and now includes a scheduler which spread dhcp and l3 agent services across all gateway nodes.
This invalidates the original HA approach; HA was on the plan for the scheduler - trying to find out if it will make grizzly.
Other than that fixed up a few other minor issues and added support for HTTPS on the quantum API service itself.
To post a comment you must log in.
James-
This looks good to me, but I can't seem to actually push the merge back?
$ bzr push :parent chroot- 93200144: ///~openstack- charmers/ charms/ precise/ quantum- gateway/ ha-support/ .bzr/branch/ lock): Transport operation not possible: readonly transport
bzr: ERROR: Cannot lock LockDir(