a bunch of updates to get it working with newer devstack