Catch another breakage, when cinder is unavailable
Catch another breakage, when cinder is unavailable

During review of backporting avoid cinder calls, this
has been discovered and should be applied to master branch.

Fixes bug 1098146

Change-Id: I74c7fabd31ed333fc9f44ec92b2c391dd7c9b9ef

blueboxgroup/horizon,mrunge/openstack_horizon,spring-week-topos/horizon-week,bac/horizon,agileblaze/OpenStackTwoFactorAuthentication,spring-week-topos/horizon-week,watonyweng/horizon,Tesora/tesora-horizon,Frostman/eho-horizon,VaneCloud/horizon,ging/horizon,Tesora/tesora-horizon,Mirantis/mos-horizon,tellesnobrega/horizon,bigswitch/horizon,bac/horizon,citrix-openstack-build/horizon,eayunstack/horizon,Tesora/tesora-horizon,dan1/horizon-proto,netscaler/horizon,vladryk/horizon,nvoron23/avos,dan1/horizon-x509,orbitfp7/horizon,mandeepdhami/horizon,noironetworks/horizon,dan1/horizon-proto,doug-fish/horizon,froyobin/horizon,BiznetGIO/horizon,saydulk/horizon,eayunstack/horizon,django-leonardo/horizon,bigswitch/horizon,zouyapeng/horizon,gerrive/horizon,FNST-OpenStack/horizon,RudoCris/horizon,yjxtogo/horizon,icloudrnd/automation_tools,damien-dg/horizon,Metaswitch/horizon,davidcusatis/horizon,pranavtendolkr/horizon,wangxiangyu/horizon,rdo-management/tuskar-ui,tqtran7/horizon,xinwu/horizon,anthonydillon/horizon,Daniex/horizon,philoniare/horizon,luhanhan/horizon,promptworks/horizon,Daniex/horizon,izadorozhna/dashboard_integration_tests,tanglei528/horizon,anthonydillon/horizon,ging/horizon,zouyapeng/horizon,noironetworks/horizon,maestro-hybrid-cloud/horizon,tqtran7/horizon,liyitest/rr,damien-dg/horizon,Solinea/horizon,JioCloud/horizon,pranavtendolkr/horizon,kaiweifan/horizon,ChameleonCloud/horizon,rdo-management/tuskar-ui,django-leonardo/horizon,tsufiev/horizon,liyitest/rr,watonyweng/horizon,coreycb/horizon,luhanhan/horizon,mrunge/horizon,endorphinl/horizon,Solinea/horizon,flochaz/horizon,doug-fish/horizon,vladryk/horizon,django-leonardo/horizon,xme1226/horizon,gerrive/horizon,openstack/horizon,newrocknj/horizon,tqtran7/horizon,opencloudconsortium/tukey-portal,kfox1111/horizon,watonyweng/horizon,NeCTAR-RC/horizon,idjaw/horizon,yanheven/console,NeCTAR-RC/horizon,flochaz/horizon,mandeepdhami/horizon,pranavtendolkr/horizon,tanglei528/horizon,wolverineav/horizon,FNST-OpenStack/horizon,liyitest/rr,icloudrnd/automation_tools,CiscoSystems/horizon,wolverineav/horizon,opencloudconsortium/tukey-portal,kfox1111/horizon,karthik-suresh/horizon,aaronorosen/horizon-congress,NCI-Cloud/horizon,Metaswitch/horizon,kaiweifan/horizon,tellesnobrega/horizon,VaneCloud/horizon,newrocknj/horizon,blueboxgroup/horizon,Metaswitch/horizon,mrunge/horizon,philoniare/horizon,sandvine/horizon,gerrive/horizon,luhanhan/horizon,opencloudconsortium/tukey-portal,gochist/horizon,ging/horizon,damien-dg/horizon,maestro-hybrid-cloud/horizon,rickerc/horizon_audit,NeCTAR-RC/horizon,Frostman/eho-horizon,VaneCloud/horizon,tqtran7/horizon,j4/horizon,saydulk/horizon,Hodorable/0602,occ-data/tukey-portal,sandvine/horizon,redhat-cip/horizon,anthonydillon/horizon,ikargis/horizon_fod,idjaw/horizon,takeshineshiro/horizon,nvoron23/avos,openstack/horizon,agileblaze/OpenStackTwoFactorAuthentication,j4/horizon,aaronorosen/horizon-congress,henaras/horizon,CiscoSystems/avos,tsufiev/horizon,netscaler/horizon,RudoCris/horizon,eayunstack/horizon,orbitfp7/horizon,ikargis/horizon_fod,davidcusatis/horizon,rdo-management/tuskar-ui,Solinea/horizon,mrunge/horizon,agileblaze/OpenStackTwoFactorAuthentication,noironetworks/horizon,endorphinl/horizon,blueboxgroup/horizon,philoniare/horizon,wangxiangyu/horizon,mdavid/horizon,JioCloud/horizon,Dark-Hacker/horizon,idjaw/horizon,dan1/horizon-proto,damien-dg/horizon,rickerc/horizon_audit,NCI-Cloud/horizon,mandeepdhami/horizon,CiscoSystems/horizon,bigswitch/horizon,LabAdvComp/tukey_portal,nvoron23/avos,karthik-suresh/horizon,wangxiangyu/horizon,yeming233/horizon,coreycb/horizon,blueboxgroup/horizon,xinwu/horizon,sandvine/horizon,FNST-OpenStack/horizon,ging/horizon,takeshineshiro/horizon,mdavid/horizon,ChameleonCloud/horizon,mrunge/openstack_horizon,mrunge/horizon_lib,yanheven/console,liyitest/rr,coreycb/horizon,Solinea/horizon,redhat-cip/horizon,Metaswitch/horizon,LabAdvComp/tukey_portal,watonyweng/horizon,tsufiev/horizon,django-leonardo/horizon,henaras/horizon,j4/horizon,r-icarus/openstack_microserver,rickerc/horizon_audit,Mirantis/mos-horizon,doug-fish/horizon,Daniex/horizon,ikargis/horizon_fod,gochist/horizon,izadorozhna/dashboard_integration_tests,yanheven/console,flochaz/horizon,JioCloud/horizon,doug-fish/horizon,kfox1111/horizon,anthonydillon/horizon,karthik-suresh/horizon,Frostman/eho-horizon,tuskar/tuskar-ui,redhat-openstack/horizon,dan1/horizon-proto,NeCTAR-RC/horizon,orbitfp7/horizon,Daniex/horizon,tellesnobrega/horizon,saydulk/horizon,redhat-cip/horizon,mdavid/horizon,mrunge/horizon_lib,froyobin/horizon,redhat-cip/horizon,yeming233/horizon,Mirantis/mos-horizon,BiznetGIO/horizon,CiscoSystems/horizon,mdavid/horizon,openstack-ja/horizon,redhat-openstack/horizon,BiznetGIO/horizon,kaiweifan/horizon,rdo-management/tuskar-ui,zouyapeng/horizon,ChameleonCloud/horizon,dan1/horizon-x509,davidcusatis/horizon,vladryk/horizon,endorphinl/horizon,r-icarus/openstack_microserver,j4/horizon,gerrive/horizon,spring-week-topos/horizon-week,citrix-openstack-build/horizon,bac/horizon,bac/horizon,endorphinl/horizon-fork,xinwu/horizon,occ-data/tukey-portal,saydulk/horizon,maestro-hybrid-cloud/horizon,BiznetGIO/horizon,newrocknj/horizon,mrunge/openstack_horizon,xme1226/horizon,VaneCloud/horizon,promptworks/horizon,endorphinl/horizon-fork,bigswitch/horizon,Hodorable/0602,nvoron23/avos,r-icarus/openstack_microserver,Dark-Hacker/horizon,ChameleonCloud/horizon,kfox1111/horizon,wolverineav/horizon,icloudrnd/automation_tools,zouyapeng/horizon,FNST-OpenStack/horizon,mandeepdhami/horizon,LabAdvComp/tukey_portal,tuskar/tuskar-ui,henaras/horizon,endorphinl/horizon-fork,openstack-ja/horizon,froyobin/horizon,promptworks/horizon,promptworks/horizon,yeming233/horizon,RudoCris/horizon,xinwu/horizon,Tesora/tesora-horizon,CiscoSystems/avos,tuskar/tuskar-ui,openstack/horizon,NCI-Cloud/horizon,luhanhan/horizon,yjxtogo/horizon,idjaw/horizon,yjxtogo/horizon,RudoCris/horizon,takeshineshiro/horizon,endorphinl/horizon,agileblaze/OpenStackTwoFactorAuthentication,newrocknj/horizon,Hodorable/0602,takeshineshiro/horizon,tellesnobrega/horizon,icloudrnd/automation_tools,dan1/horizon-x509,yeming233/horizon,wolverineav/horizon,henaras/horizon,CiscoSystems/horizon,endorphinl/horizon-fork,yjxtogo/horizon,karthik-suresh/horizon,sandvine/horizon,mrunge/horizon_lib,citrix-openstack-build/horizon,LabAdvComp/tukey_portal,philoniare/horizon,netscaler/horizon,davidcusatis/horizon,xme1226/horizon,Hodorable/0602,occ-data/tukey-portal,aaronorosen/horizon-congress,coreycb/horizon,noironetworks/horizon,dan1/horizon-x509,openstack/horizon,flochaz/horizon,NCI-Cloud/horizon,pranavtendolkr/horizon,CiscoSystems/avos,maestro-hybrid-cloud/horizon,tsufiev/horizon,Mirantis/mos-horizon,Dark-Hacker/horizon,openstack-ja/horizon,tanglei528/horizon,CiscoSystems/avos,redhat-openstack/horizon,redhat-openstack/horizon,wangxiangyu/horizon,Dark-Hacker/horizon,orbitfp7/horizon,vladryk/horizon,gochist/horizon