[pve-devel] [PATCH qemu-server 1/2] fix #3314: IPv6 requires type 'static6'

[pve-devel] [PATCH qemu-server 1/2] fix #3314: IPv6 requires type 'static6'

[Mira Limbeck]

A fix was also provided in bugzilla by user wsapplegate:
https://bugzilla.proxmox.com/show_bug.cgi?id=3314

Tested on Ubuntu 20.04, CentOS 8 and Debian 10.

Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
---
anything else required regarding attribution?

 PVE/QemuServer/Cloudinit.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm
index c464bf3..3224dd0 100644
--- a/PVE/QemuServer/Cloudinit.pm
+++ b/PVE/QemuServer/Cloudinit.pm
@@ -452,7 +452,7 @@ sub nocloud_network {
 		# SLAAC is not supported by cloud-init, this fallback should work with an up-to-date netplan at least
 		$content .= "${i}- type: dhcp6\n";
 	    } else {
-		$content .= "${i}- type: static\n"
+		$content .= "${i}- type: static6\n"
 		       . "${i}  address: '$ip'\n";
 		if (defined(my $gw = $ipconfig->{gw6})) {
 		    $content .= "${i}  gateway: '$gw'\n";
-- 
2.20.1

[pve-devel] [PATCH qemu-server 2/2] fix #2670: cloudinit enable SLAAC

[Mira Limbeck]

cloud-init's SLAAC option was disabled in 2018 because there was no
support for it. Now that cloud-init 19.4 or newer versions are more
widespread, we can finally reenable it.

Also include minimum required cloud-init version for SLAAC support in
format description.

Tested on Ubuntu 20.04 (ci 20.4), CentOS 8 (ci 19.4), Debian 10 (ci
20.2).

Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
---
 PVE/QemuServer.pm           | 3 ++-
 PVE/QemuServer/Cloudinit.pm | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 1c0b5c2..7dd4bcf 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -964,7 +964,8 @@ IP addresses use CIDR notation, gateways are optional but need an IP of the same
 
 The special string 'dhcp' can be used for IP addresses to use DHCP, in which case no explicit
 gateway should be provided.
-For IPv6 the special string 'auto' can be used to use stateless autoconfiguration.
+For IPv6 the special string 'auto' can be used to use stateless autoconfiguration. This requires
+cloud-init 19.4 or newer.
 
 If cloud-init is enabled and neither an IPv4 nor an IPv6 address is specified, it defaults to using
 dhcp on IPv4.
diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm
index 3224dd0..a5474d3 100644
--- a/PVE/QemuServer/Cloudinit.pm
+++ b/PVE/QemuServer/Cloudinit.pm
@@ -449,8 +449,8 @@ sub nocloud_network {
 	    if ($ip eq 'dhcp') {
 		$content .= "${i}- type: dhcp6\n";
 	    } elsif ($ip eq 'auto') {
-		# SLAAC is not supported by cloud-init, this fallback should work with an up-to-date netplan at least
-		$content .= "${i}- type: dhcp6\n";
+		# SLAAC is only supported by cloud-init since 19.4
+		$content .= "${i}- type: ipv6_slaac\n";
 	    } else {
 		$content .= "${i}- type: static6\n"
 		       . "${i}  address: '$ip'\n";
-- 
2.20.1

[pve-devel] [PATCH manager] js: readd SLAAC option to IPConfig

[Mira Limbeck]

Now that SLAAC is supported, we can revert commit 76fdf552.
SLAAC requires cloud-init 19.4 or newer.

Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
---
 www/manager6/qemu/IPConfigEdit.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/www/manager6/qemu/IPConfigEdit.js b/www/manager6/qemu/IPConfigEdit.js
index 6e6ec4f5..829240c2 100644
--- a/www/manager6/qemu/IPConfigEdit.js
+++ b/www/manager6/qemu/IPConfigEdit.js
@@ -158,6 +158,14 @@ Ext.define('PVE.qemu.IPConfigPanel', {
 			checked: false,
 			margin: '0 0 0 10',
 		    },
+		    {
+			xtype: 'radiofield',
+			boxLabel: gettext('SLAAC'),
+			name: 'ipv6mode',
+			inputValue: 'auto',
+			checked: false,
+			margin: '0 0 0 10',
+		    },
 		],
 	    },
 	    {
-- 
2.20.1

[pve-devel] applied: [PATCH qemu-server 1/2] fix #3314: IPv6 requires type 'static6'

[Thomas Lamprecht]

On 29.03.21 14:07, Mira Limbeck wrote:
> A fix was also provided in bugzilla by user wsapplegate:
> https://bugzilla.proxmox.com/show_bug.cgi?id=3314
> 
> Tested on Ubuntu 20.04, CentOS 8 and Debian 10.
> 
> Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
> ---
> anything else required regarding attribution?
> 
>  PVE/QemuServer/Cloudinit.pm | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
>

applied, thanks!

[pve-devel] applied: [PATCH qemu-server 2/2] fix #2670: cloudinit enable SLAAC

[Thomas Lamprecht]

On 29.03.21 14:07, Mira Limbeck wrote:
> cloud-init's SLAAC option was disabled in 2018 because there was no
> support for it. Now that cloud-init 19.4 or newer versions are more
> widespread, we can finally reenable it.
> 
> Also include minimum required cloud-init version for SLAAC support in
> format description.
> 
> Tested on Ubuntu 20.04 (ci 20.4), CentOS 8 (ci 19.4), Debian 10 (ci
> 20.2).
> 
> Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
> ---
>  PVE/QemuServer.pm           | 3 ++-
>  PVE/QemuServer/Cloudinit.pm | 4 ++--
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
>

applied, thanks!

[pve-devel] applied: [PATCH manager] js: readd SLAAC option to IPConfig

[Thomas Lamprecht]

On 29.03.21 14:07, Mira Limbeck wrote:
> Now that SLAAC is supported, we can revert commit 76fdf552.
> SLAAC requires cloud-init 19.4 or newer.
> 
> Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
> ---
>  www/manager6/qemu/IPConfigEdit.js | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
>

applied, thanks!