mnl/VM-Operator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 4 Wiki Activity Actions

Handle bridge name correctly.

Browse source
This commit is contained in:
Michael Lipp 2023-06-18 14:38:53 +02:00
parent 080156157f
commit 23ca2e0e43
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
org.jdrupes.vmoperator.runner.qemu/.gitignore vendored
View file

@ -1,3 +1,4 @@
config.yaml config.yaml
/config-w11.yaml /config-w11.yaml
/config-fedora.yaml /config-fedora.yaml
/config-test-vm.yaml

2
org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Configuration.java
View file

@ -159,7 +159,7 @@ class Configuration implements Dto {
*/ */
public static class Network implements Dto { public static class Network implements Dto {
public String type = "tap"; public String type = "tap";
public String bridge = "br0"; public String bridge;
public String device = "virtio-net"; public String device = "virtio-net";
public String mac; public String mac;
public String net; public String net;

3
org.jdrupes.vmoperator.runner.qemu/templates/Standard-VM-latest.ftl.yaml
View file

@ -123,7 +123,8 @@
<#list vm.network![] as itf> <#list vm.network![] as itf>
<#switch itf.type!"tap"> <#switch itf.type!"tap">
<#case "tap"> <#case "tap">
- [ "-netdev", "bridge,id=hostnet${ nwCounter }" ] - [ "-netdev", "bridge,id=hostnet${ nwCounter }\
<#if itf.bridge??>,br=${ itf.bridge }</#if>" ]
- [ "-device", "${ itf.device },netdev=hostnet${ nwCounter }\ - [ "-device", "${ itf.device },netdev=hostnet${ nwCounter }\
<#if itf.mac??>,mac=${ itf.mac }</#if>" ] <#if itf.mac??>,mac=${ itf.mac }</#if>" ]
<#break> <#break>