Reliably include OS type in ephemeral filenames.
Reliably include OS type in ephemeral filenames.

Either include the OS type, or "default" if this isn't specified.

Also, I don't see why we care what ephemeral disk number this disk
was created as (they're all empty images in base, right?) so I've
removed that.

Resolves bug 1087030.

Change-Id: Iee7f8e9033a2e6a829421763090ed0e67c6b2da8

devoid/nova,blueboxgroup/nova,devendermishrajio/nova,alexandrucoman/vbox-nova-driver,kimjaejoong/nova,double12gzh/nova,Triv90/Nova,jeffrey4l/nova,gspilio/nova,isyippee/nova,JianyuWang/nova,vmturbo/nova,CCI-MOC/nova,cloudbau/nova,Tehsmash/nova,angdraug/nova,maoy/zknova,thomasem/nova,dawnpower/nova,maheshp/novatest,alvarolopez/nova,alaski/nova,tianweizhang/nova,felixma/nova,hanlind/nova,Juniper/nova,edulramirez/nova,BeyondTheClouds/nova,mahak/nova,barnsnake351/nova,sridevikoushik31/openstack,BeyondTheClouds/nova,dawnpower/nova,zzicewind/nova,tangfeixiong/nova,fajoy/nova,phenoxim/nova,mmnelemane/nova,badock/nova,rajalokan/nova,Stavitsky/nova,LoHChina/nova,kimjaejoong/nova,maheshp/novatest,cloudbase/nova,maoy/zknova,TieWei/nova,tealover/nova,double12gzh/nova,varunarya10/nova_test_latest,devoid/nova,belmiromoreira/nova,jianghuaw/nova,eayunstack/nova,mgagne/nova,spring-week-topos/nova-week,tianweizhang/nova,dstroppa/openstack-smartos-nova-grizzly,takeshineshiro/nova,leilihh/nova,tealover/nova,sacharya/nova,akash1808/nova_test_latest,plumgrid/plumgrid-nova,sridevikoushik31/openstack,Francis-Liu/animated-broccoli,zaina/nova,edulramirez/nova,saleemjaveds/https-github.com-openstack-nova,houshengbo/nova_vmware_compute_driver,eonpatapon/nova,virtualopensystems/nova,akash1808/nova_test_latest,jianghuaw/nova,raildo/nova,dstroppa/openstack-smartos-nova-grizzly,tudorvio/nova,sebrandon1/nova,thomasem/nova,eayunstack/nova,TwinkleChawla/nova,cernops/nova,devendermishrajio/nova,Juniper/nova,JioCloud/nova_test_latest,petrutlucian94/nova_dev,angdraug/nova,sridevikoushik31/nova,mikalstill/nova,JioCloud/nova,openstack/nova,Triv90/Nova,ruslanloman/nova,yrobla/nova,zhimin711/nova,sridevikoushik31/nova,alexandrucoman/vbox-nova-driver,gooddata/openstack-nova,cloudbase/nova-virtualbox,mahak/nova,CCI-MOC/nova,MountainWei/nova,hanlind/nova,joker946/nova,silenceli/nova,redhat-openstack/nova,fajoy/nova,CloudServer/nova,j-carpentier/nova,cloudbau/nova,cyx1231st/nova,yatinkumbhare/openstack-nova,raildo/nova,rickerc/nova_audit,Stavitsky/nova,maoy/zknova,adelina-t/nova,shail2810/nova,projectcalico/calico-nova,devendermishrajio/nova_test_latest,ted-gould/nova,sacharya/nova,LoHChina/nova,fnordahl/nova,DirectXMan12/nova-hacking,yosshy/nova,tudorvio/nova,whitepages/nova,klmitch/nova,dims/nova,citrix-openstack-build/nova,yrobla/nova,gooddata/openstack-nova,akash1808/nova,dims/nova,barnsnake351/nova,vmturbo/nova,maheshp/novatest,shootstar/novatest,jianghuaw/nova,rahulunair/nova,CEG-FYP-OpenStack/scheduler,apporc/nova,leilihh/novaha,CEG-FYP-OpenStack/scheduler,MountainWei/nova,isyippee/nova,alvarolopez/nova,maelnor/nova,cloudbase/nova,sridevikoushik31/openstack,apporc/nova,berrange/nova,TwinkleChawla/nova,klmitch/nova,ewindisch/nova,zzicewind/nova,rahulunair/nova,eonpatapon/nova,zaina/nova,Juniper/nova,OpenAcademy-OpenStack/nova-scheduler,imsplitbit/nova,JioCloud/nova_test_latest,yrobla/nova,Francis-Liu/animated-broccoli,bgxavier/nova,mikalstill/nova,Yuriy-Leonov/nova,zhimin711/nova,nikesh-mahalka/nova,yatinkumbhare/openstack-nova,rajalokan/nova,mahak/nova,CiscoSystems/nova,Brocade-OpenSource/OpenStack-DNRM-Nova,tanglei528/nova,TieWei/nova,alaski/nova,nikesh-mahalka/nova,Yusuke1987/openstack_template,NeCTAR-RC/nova,bclau/nova,tanglei528/nova,saleemjaveds/https-github.com-openstack-nova,Metaswitch/calico-nova,redhat-openstack/nova,adelina-t/nova,SUSE-Cloud/nova,spring-week-topos/nova-week,petrutlucian94/nova_dev,rahulunair/nova,noironetworks/nova,leilihh/nova,vladikr/nova_drafts,vladikr/nova_drafts,BeyondTheClouds/nova,Juniper/nova,eharney/nova,projectcalico/calico-nova,OpenAcademy-OpenStack/nova-scheduler,maelnor/nova,shootstar/novatest,whitepages/nova,petrutlucian94/nova,orbitfp7/nova,gspilio/nova,citrix-openstack-build/nova,watonyweng/nova,fnordahl/nova,felixma/nova,sridevikoushik31/nova,noironetworks/nova,berrange/nova,ewindisch/nova,gooddata/openstack-nova,Yuriy-Leonov/nova,hanlind/nova,cernops/nova,mmnelemane/nova,CiscoSystems/nova,Tehsmash/nova,virtualopensystems/nova,ntt-sic/nova,joker946/nova,scripnichenko/nova,cernops/nova,Yusuke1987/openstack_template,badock/nova,rajalokan/nova,affo/nova,ted-gould/nova,Triv90/Nova,scripnichenko/nova,NeCTAR-RC/nova,bclau/nova,akash1808/nova,houshengbo/nova_vmware_compute_driver,CloudServer/nova,cloudbase/nova-virtualbox,klmitch/nova,shail2810/nova,tangfeixiong/nova,vmturbo/nova,silenceli/nova,blueboxgroup/nova,qwefi/nova,viggates/nova,yosshy/nova,luogangyi/bcec-nova,DirectXMan12/nova-hacking,JioCloud/nova,qwefi/nova,DirectXMan12/nova-hacking,fajoy/nova,orbitfp7/nova,watonyweng/nova,gspilio/nova,cloudbase/nova,luogangyi/bcec-nova,varunarya10/nova_test_latest,iuliat/nova,imsplitbit/nova,sebrandon1/nova,belmiromoreira/nova,iuliat/nova,plumgrid/plumgrid-nova,vmturbo/nova,bigswitch/nova,gooddata/openstack-nova,takeshineshiro/nova,openstack/nova,bgxavier/nova,mandeepdhami/nova,viggates/nova,sebrandon1/nova,devendermishrajio/nova_test_latest,rrader/nova-docker-plugin,JianyuWang/nova,leilihh/novaha,bigswitch/nova,ruslanloman/nova,petrutlucian94/nova,jeffrey4l/nova,mgagne/nova,openstack/nova,rrader/nova-docker-plugin,eharney/nova,sridevikoushik31/nova,Metaswitch/calico-nova,mikalstill/nova,ntt-sic/nova,dstroppa/openstack-smartos-nova-grizzly,shahar-stratoscale/nova,rickerc/nova_audit,jianghuaw/nova,shahar-stratoscale/nova,Brocade-OpenSource/OpenStack-DNRM-Nova,houshengbo/nova_vmware_compute_driver,j-carpentier/nova,affo/nova,rajalokan/nova,klmitch/nova,SUSE-Cloud/nova,cyx1231st/nova,mandeepdhami/nova,phenoxim/nova