correct broken logic for lxc and uml to avoid adding vnc arguments (LP: #812553)
correct broken logic for lxc and uml to avoid adding vnc arguments (LP: #812553)

This fixes the logic, so that lxc and uml will not get vnc arguments added to
their libvirt xml.  To also seems more readable to me.

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