Update the openstack ones so that they don't overlap devices in lab Add the MAAS plans that had been staged for a bit
* Add the variabe definition of machines, which was in another file * Add all the networking bits for MAAS