add discovery options for the version of openstack we are running against as well as setting the type of networking
fix tests for both neutron and quantum