Moved some more code into the openstack class.