From 9a6ccb12efa676c7603c2c3891644d08ea4aedd6 Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Mon, 12 Mar 2018 16:25:04 +0100 Subject: [PATCH] cloud-init: use default hostname when none is set use "VM$vmid" like we do in a container Signed-off-by: Dominik Csapak --- PVE/QemuServer/Cloudinit.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm index dc55d2d8..31f84620 100644 --- a/PVE/QemuServer/Cloudinit.pm +++ b/PVE/QemuServer/Cloudinit.pm @@ -63,8 +63,8 @@ sub get_cloudinit_format { } sub get_hostname_fqdn { - my ($conf) = @_; - my $hostname = $conf->{name}; + my ($conf, $vmid) = @_; + my $hostname = $conf->{name} // "VM$vmid"; my $fqdn; if ($hostname =~ /\./) { $fqdn = $hostname; @@ -96,9 +96,9 @@ sub get_dns_conf { } sub cloudinit_userdata { - my ($conf) = @_; + my ($conf, $vmid) = @_; - my ($hostname, $fqdn) = get_hostname_fqdn($conf); + my ($hostname, $fqdn) = get_hostname_fqdn($conf, $vmid); my $content = "#cloud-config\n"; @@ -198,7 +198,7 @@ EOF sub generate_configdrive2 { my ($conf, $vmid, $drive, $volname, $storeid) = @_; - my $user_data = cloudinit_userdata($conf); + my $user_data = cloudinit_userdata($conf, $vmid); my $network_data = configdrive2_network($conf); my $digest_data = $user_data . $network_data; @@ -363,7 +363,7 @@ sub nocloud_metadata { sub generate_nocloud { my ($conf, $vmid, $drive, $volname, $storeid) = @_; - my $user_data = cloudinit_userdata($conf); + my $user_data = cloudinit_userdata($conf, $vmid); my $network_data = nocloud_network($conf); my $digest_data = $user_data . $network_data; -- 2.39.5