Merge lp://staging/~nick-moffitt/charms/precise/virtual-maas/limit-virtual-maas-dhcp-by-mac-address into lp://staging/~virtual-maasers/charms/precise/virtual-maas/trunk
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~nick-moffitt/charms/precise/virtual-maas/limit-virtual-maas-dhcp-by-mac-address |
| Merge into: | lp://staging/~virtual-maasers/charms/precise/virtual-maas/trunk |
| Diff against target: |
23 lines (+15/-0) 1 file modified
scripts/setup-maas (+15/-0) |
| To merge this branch: | bzr merge lp://staging/~nick-moffitt/charms/precise/virtual-maas/limit-virtual-maas-dhcp-by-mac-address |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Virtual Maasers | Pending | ||
|
Review via email:
|
|||
Description of the change
We use virtual-maas to deploy openstack charms for testing. Unfortunately the virtual-maas DHCP server steps on the openstack DHCP responses.
This change patches setup-maas to edit the dhcpd.conf and wrap the virtual-maas IP range in a pool directive that limits to MACs beginning with 52:54:00 (which all virtual-maas instances do, but luckily openstack chose a different prefix).
This has been tested lightly and shown to work in a limited case, but I may have been overbroad with the editing directives or the MAC pattern I chose.
Unmerged revisions
- 52. By Nick Moffitt
-
the comment broke the sed command too much
- 51. By Nick Moffitt
-
Use sed in the setup-maas script to hack in an acl class so that our DHCP range is limited to the MACs that our virtual-maas creates. This makes it easier to deploy and test openstack charms inside virtual-maas.
I used sed in slightly more advanced ways than most of the rest of this script (which limits itself to the s/foo/bar/ construct, mainly). I tried to document the sed features used, to make it clearer how it works.
