Remove hardcoding of cirros
Merge branch 'master' of github.com:vedujoshi/tempest