replace Fog.mock with rspec instance doubles around cyoi
reenable openstack new-release test with new instance doubles
rename variables