Remove reliance on other openstack modules

Change-Id: I062ddd468fa0cb6594d0cc26fc3822d82cb60e5f