diff --git a/org.jdrupes.vmoperator.runner.qemu/.gitignore b/org.jdrupes.vmoperator.runner.qemu/.gitignore index 3c9dbbf..c43bf05 100644 --- a/org.jdrupes.vmoperator.runner.qemu/.gitignore +++ b/org.jdrupes.vmoperator.runner.qemu/.gitignore @@ -1,3 +1,4 @@ config.yaml /config-w11.yaml /config-fedora.yaml +/config-test-vm.yaml diff --git a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Configuration.java b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Configuration.java index ce7e8b3..7c75f10 100644 --- a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Configuration.java +++ b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Configuration.java @@ -159,7 +159,7 @@ class Configuration implements Dto { */ public static class Network implements Dto { public String type = "tap"; - public String bridge = "br0"; + public String bridge; public String device = "virtio-net"; public String mac; public String net; diff --git a/org.jdrupes.vmoperator.runner.qemu/templates/Standard-VM-latest.ftl.yaml b/org.jdrupes.vmoperator.runner.qemu/templates/Standard-VM-latest.ftl.yaml index 585fd77..9ddc4a8 100644 --- a/org.jdrupes.vmoperator.runner.qemu/templates/Standard-VM-latest.ftl.yaml +++ b/org.jdrupes.vmoperator.runner.qemu/templates/Standard-VM-latest.ftl.yaml @@ -123,7 +123,8 @@ <#list vm.network![] as itf> <#switch itf.type!"tap"> <#case "tap"> - - [ "-netdev", "bridge,id=hostnet${ nwCounter }" ] + - [ "-netdev", "bridge,id=hostnet${ nwCounter }\ + <#if itf.bridge??>,br=${ itf.bridge }" ] - [ "-device", "${ itf.device },netdev=hostnet${ nwCounter }\ <#if itf.mac??>,mac=${ itf.mac }" ] <#break>