Merge lp://staging/~tribaal/charms/trusty/quantum-gateway/fix-1361712-ignore-mac-addresses-in-use into lp://staging/charms/trusty/quantum-gateway
| Status: | Superseded | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~tribaal/charms/trusty/quantum-gateway/fix-1361712-ignore-mac-addresses-in-use | ||||
| Merge into: | lp://staging/charms/trusty/quantum-gateway | ||||
| Diff against target: |
150 lines (+80/-8) 3 files modified
config.yaml (+5/-2) hooks/quantum_contexts.py (+45/-5) unit_tests/test_quantum_contexts.py (+30/-1) |
||||
| To merge this branch: | bzr merge lp://staging/~tribaal/charms/trusty/quantum-gateway/fix-1361712-ignore-mac-addresses-in-use | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenStack Charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
This branch fixes the related bug, where passing an interface's MAC address to the charm when the interface was connected already resulted in a non-functional cloud.
The selection now does the following:
If it's a MAC address, make sure it's assigned to an interface, and if it is, make sure it's not already in use (we can't assign the interface to be the external network if it already has an IP address).
If it's not a MAC address, assume it's an interface path and use it directly.
The following scenario now works:
- The quantum gateway machine has two interfaces, one on the private network and one on a public network to use with instances.
- Pass all the machine's MAC addresses as ext-port (the case for MAAS for example).
- The private network interface will not be considered (since it already has an IP address assigned)
- The rest of MAC addresses are considered according to the normal rules.
| Adam Collard (adam-collard) wrote | # |
| Chris Glass (tribaal) wrote | # |
Unmerged revisions
- 55. By Chris Glass
-
Addressed review comments.
- 54. By Chris Glass
-
Added comments and prose.
- 53. By Chris Glass
-
Added logging information
- 52. By Chris Glass
-
Filter mac addresses that belong to interfaces with assigned IP addresses out.
- 51. By Liam Young
-
[gnuoy, r=tribaal] Sync charm-helpers from lp:charm-helpers
Some style comments below (7 inline)