proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-11 12:33:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cloud-init: use default hostname when none is set

Browse Source 
use "VM$vmid" like we do in a container

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2018-03-12 16:25:04 +01:00 committed by Wolfgang Bumiller
parent 29d1f14708
commit 9a6ccb12ef
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PVE/QemuServer/Cloudinit.pm
View File

@ -63,8 +63,8 @@ sub get_cloudinit_format {
} }
sub get_hostname_fqdn { sub get_hostname_fqdn {
my ($conf) = @_; my ($conf, $vmid) = @_;
my $hostname = $conf->{name}; my $hostname = $conf->{name} // "VM$vmid";
my $fqdn; my $fqdn;
if ($hostname =~ /\./) { if ($hostname =~ /\./) {
$fqdn = $hostname; $fqdn = $hostname;
@ -96,9 +96,9 @@ sub get_dns_conf {
} }
sub cloudinit_userdata { 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"; my $content = "#cloud-config\n";
@ -198,7 +198,7 @@ EOF
sub generate_configdrive2 { sub generate_configdrive2 {
my ($conf, $vmid, $drive, $volname, $storeid) = @_; 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 $network_data = configdrive2_network($conf);
my $digest_data = $user_data . $network_data; my $digest_data = $user_data . $network_data;
@ -363,7 +363,7 @@ sub nocloud_metadata {
sub generate_nocloud { sub generate_nocloud {
my ($conf, $vmid, $drive, $volname, $storeid) = @_; 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 $network_data = nocloud_network($conf);
my $digest_data = $user_data . $network_data; my $digest_data = $user_data . $network_data;