Commit 31894c5f authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼 Committed by Alain Takoudjou

[kvm] use-tap is true by default

/cc @rafael @jm @alain.takoudjou 

Here we go

/reviewed-on nexedi/slapos!529
parent b655890d
...@@ -59,8 +59,8 @@ KVM instance parameters: ...@@ -59,8 +59,8 @@ KVM instance parameters:
For port forwarding to IPv6 of slapos partition For port forwarding to IPv6 of slapos partition
- use-nat (default: True) - use-nat (default: True)
Add one interface using qemu User Network (NAT), this interface support nat-rules. Add one interface using qemu User Network (NAT), this interface support nat-rules.
- use-tap (default: False) - use-tap (default: True)
Add One interface that use tap interface Add one interface that uses tap interface from the host
- enable-vhost (default: False) - enable-vhost (default: False)
Increase network speed by enabling vhost on qemu. (To use if the module is loaded on host machine) Increase network speed by enabling vhost on qemu. (To use if the module is loaded on host machine)
......
...@@ -19,7 +19,7 @@ md5sum = 028b6a6456d744c11b1bb2c51ecd51b2 ...@@ -19,7 +19,7 @@ md5sum = 028b6a6456d744c11b1bb2c51ecd51b2
[template-kvm] [template-kvm]
filename = instance-kvm.cfg.jinja2 filename = instance-kvm.cfg.jinja2
md5sum = c51026e815ca43b5de5ddc6cbd8bf1e2 md5sum = c298aaa20a368ddc118b8bb22dc84dc3
[template-kvm-cluster] [template-kvm-cluster]
filename = instance-kvm-cluster.cfg.jinja2.in filename = instance-kvm-cluster.cfg.jinja2.in
......
...@@ -266,9 +266,9 @@ ...@@ -266,9 +266,9 @@
}, },
"use-tap": { "use-tap": {
"title": "Use QEMU TAP network interface", "title": "Use QEMU TAP network interface",
"description": "Use QEMU TAP network interface, might require a bridge on SlapOS Node.", "description": "Use QEMU TAP network interface, requires taps creation on SlapOS Node.",
"type": "boolean", "type": "boolean",
"default": false "default": true
}, },
"use-nat": { "use-nat": {
"title": "Use QEMU USER Mode interface (NAT)", "title": "Use QEMU USER Mode interface (NAT)",
...@@ -278,7 +278,7 @@ ...@@ -278,7 +278,7 @@
}, },
"nat-rules": { "nat-rules": {
"title": "List of rules for NAT of QEMU user mode network stack.", "title": "List of rules for NAT of QEMU user mode network stack.",
"description": "List of rules for NAT of QEMU user mode network stack, as space-separated list of ports (with optional protocol). For each port specified, it will redirect port x of the VM (example: \"80 udp:53\") to the port x + 10000 of the public IPv6 of the host (example: \"10080 udp:10053\"). Ignored if \"use-tap\" parameter is enabled.", "description": "List of rules for NAT of QEMU user mode network stack, as space-separated list of ports (with optional protocol). For each port specified, it will redirect port x of the VM (example: \"80 udp:53\") to the port x + 10000 of the public IPv6 of the host (example: \"10080 udp:10053\").",
"type": "string", "type": "string",
"default": "22 80 443" "default": "22 80 443"
}, },
......
{% set enable_http = slapparameter_dict.get('enable-http-server', 'False').lower() -%} {% set enable_http = slapparameter_dict.get('enable-http-server', 'False').lower() -%}
{% set use_tap = slapparameter_dict.get('use-tap', 'False').lower() -%} {% set use_tap = slapparameter_dict.get('use-tap', 'True').lower() -%}
{% set use_nat = slapparameter_dict.get('use-nat', 'True').lower() -%} {% set use_nat = slapparameter_dict.get('use-nat', 'True').lower() -%}
{% set wipe_disk = slapparameter_dict.get('wipe-disk-ondestroy', 'False').lower() -%} {% set wipe_disk = slapparameter_dict.get('wipe-disk-ondestroy', 'False').lower() -%}
{% set nat_restrict = slapparameter_dict.get('nat-restrict-mode', 'False').lower() -%} {% set nat_restrict = slapparameter_dict.get('nat-restrict-mode', 'False').lower() -%}
...@@ -677,7 +677,7 @@ cpu-model = host ...@@ -677,7 +677,7 @@ cpu-model = host
nat-rules = 22 80 443 nat-rules = 22 80 443
use-nat = True use-nat = True
use-tap = False use-tap = True
nat-restrict-mode = False nat-restrict-mode = False
enable-vhost = False enable-vhost = False
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment