Added database type
Merge branch 'master' of https://github.com/citrix-openstack/qa