use PVE::QemuServer;
sub commit_cloudinit_disk {
- my ($vmid, $conf, $drive, $volname, $storeid, $files, $label) = @_;
+ my ($conf, $vmid, $drive, $volname, $storeid, $files, $label) = @_;
my $path = "/run/pve/cloudinit/$vmid/";
mkpath $path;
my $storecfg = PVE::Storage::config();
my $iso_path = PVE::Storage::path($storecfg, $drive->{file});
my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
+ my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
+ $plugin->activate_volume($storeid, $scfg, $volname);
my $format = PVE::QemuServer::qemu_img_format($scfg, $volname);
my $size = PVE::Storage::file_size_info($iso_path);
eval {
run_command([['genisoimage', '-R', '-V', $label, $path],
- ['qemu-img', 'dd', '-f', 'raw', '-O', $format,
+ ['qemu-img', 'dd', '-n', '-f', 'raw', '-O', $format,
'isize=0', "osize=$size", "of=$iso_path"]]);
};
my $err = $@;
}
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;
return ($hostname, $fqdn);
}
-sub cloudinit_userdata {
+sub get_dns_conf {
my ($conf) = @_;
- my ($hostname, $fqdn) = get_hostname_fqdn($conf);
+ # Same logic as in pve-container, but without the testcase special case
+ my $host_resolv_conf = PVE::INotify::read_file('resolvconf');
+
+ my $searchdomains = [
+ split(/\s+/, $conf->{searchdomain} // $host_resolv_conf->{search})
+ ];
+
+ my $nameserver = $conf->{nameserver};
+ if (!defined($nameserver)) {
+ $nameserver = [grep { $_ } $host_resolv_conf->@{qw(dns1 dns2 dns3)}];
+ } else {
+ $nameserver = [split(/\s+/, $nameserver)];
+ }
+
+ return ($searchdomains, $nameserver);
+}
+
+sub cloudinit_userdata {
+ my ($conf, $vmid) = @_;
+
+ my ($hostname, $fqdn) = get_hostname_fqdn($conf, $vmid);
my $content = "#cloud-config\n";
- $content .= "manage_resolv_conf: true\n";
$content .= "hostname: $hostname\n";
+ $content .= "manage_etc_hosts: true\n";
$content .= "fqdn: $fqdn\n" if defined($fqdn);
my $username = $conf->{ciuser};
return $content;
}
+sub split_ip4 {
+ my ($ip) = @_;
+ my ($addr, $mask) = split('/', $ip);
+ die "not a CIDR: $ip\n" if !defined $mask;
+ return ($addr, $PVE::Network::ipv4_reverse_mask->[$mask]);
+}
+
sub configdrive2_network {
my ($conf) = @_;
my $content = "auto lo\n";
- $content .="iface lo inet loopback\n\n";
+ $content .= "iface lo inet loopback\n\n";
+
+ my ($searchdomains, $nameservers) = get_dns_conf($conf);
+ if ($nameservers && @$nameservers) {
+ $nameservers = join(' ', @$nameservers);
+ $content .= " dns_nameservers $nameservers\n";
+ }
+ if ($searchdomains && @$searchdomains) {
+ $searchdomains = join(' ', @$searchdomains);
+ $content .= " dns_search $searchdomains\n";
+ }
my @ifaces = grep(/^net(\d+)$/, keys %$conf);
foreach my $iface (@ifaces) {
if ($net->{ip} eq 'dhcp') {
$content .= "iface $id inet dhcp\n";
} else {
- my ($addr, $mask) = split('/', $net->{ip});
+ my ($addr, $mask) = split_ip4($net->{ip});
$content .= "iface $id inet static\n";
$content .= " address $addr\n";
- $content .= " netmask $PVE::Network::ipv4_reverse_mask->[$mask]\n";
+ $content .= " netmask $mask\n";
$content .= " gateway $net->{gw}\n" if $net->{gw};
}
}
}
}
- $content .=" dns_nameservers $conf->{nameserver}\n" if $conf->{nameserver};
- $content .=" dns_search $conf->{searchdomain}\n" if $conf->{searchdomain};
-
return $content;
}
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;
'/openstack/content/0000' => $network_data,
'/openstack/latest/meta_data.json' => $meta_data
};
- commit_cloudinit_disk($vmid, $conf, $drive, $volname, $storeid, $files, 'config-2');
+ commit_cloudinit_disk($conf, $vmid, $drive, $volname, $storeid, $files, 'config-2');
}
sub nocloud_network_v2 {
my $head = "version: 2\n"
. "ethernets:\n";
- my $nameservers_done;
+ my $dns_done;
my @ifaces = grep(/^net(\d+)$/, keys %$conf);
foreach my $iface (@ifaces) {
my $mac = $net->{macaddr}
or die "network interface '$iface' has no mac address\n";
- my $data = "${i}$iface:\n";
+ $content .= "${i}$iface:\n";
$i .= ' ';
- $data .= "${i}match:\n"
- . "${i} macaddress: \"$mac\"\n"
- . "${i}set-name: eth$id\n";
+ $content .= "${i}match:\n"
+ . "${i} macaddress: \"$mac\"\n"
+ . "${i}set-name: eth$id\n";
my @addresses;
if (defined(my $ip = $ipconfig->{ip})) {
if ($ip eq 'dhcp') {
- $data .= "${i}dhcp4: true\n";
+ $content .= "${i}dhcp4: true\n";
} else {
push @addresses, $ip;
}
}
if (defined(my $ip = $ipconfig->{ip6})) {
if ($ip eq 'dhcp') {
- $data .= "${i}dhcp6: true\n";
+ $content .= "${i}dhcp6: true\n";
} else {
push @addresses, $ip;
}
}
if (@addresses) {
- $data .= "${i}addresses:\n";
- $data .= "${i}- $_\n" foreach @addresses;
+ $content .= "${i}addresses:\n";
+ $content .= "${i}- $_\n" foreach @addresses;
}
if (defined(my $gw = $ipconfig->{gw})) {
- $data .= "${i}gateway4: $gw\n";
+ $content .= "${i}gateway4: $gw\n";
}
if (defined(my $gw = $ipconfig->{gw6})) {
- $data .= "${i}gateway6: $gw\n";
+ $content .= "${i}gateway6: $gw\n";
}
- if (!$nameservers_done) {
- $nameservers_done = 1;
-
- my $nameserver = $conf->{nameserver} // '';
- my $searchdomain = $conf->{searchdomain} // '';
- my @nameservers = PVE::Tools::split_list($nameserver);
- my @searchdomains = PVE::Tools::split_list($searchdomain);
- if (@nameservers || @searchdomains) {
- $data .= "${i}nameservers:\n";
- $data .= "${i} addresses: [".join(',', @nameservers)."]\n"
- if @nameservers;
- $data .= "${i} search: [".join(',', @searchdomains)."]\n"
- if @searchdomains;
+ next if $dns_done;
+ $dns_done = 1;
+
+ my ($searchdomains, $nameservers) = get_dns_conf($conf);
+ if ($searchdomains || $nameservers) {
+ $content .= "${i}nameservers:\n";
+ if (defined($nameservers) && @$nameservers) {
+ $content .= "${i} addresses:\n";
+ $content .= "${i} - $_\n" foreach @$nameservers;
+ }
+ if (defined($searchdomains) && @$searchdomains) {
+ $content .= "${i} search:\n";
+ $content .= "${i} - $_\n" foreach @$searchdomains;
}
}
-
-
- $content .= $data;
}
return $head.$content;
my $net = PVE::QemuServer::parse_net($conf->{$iface});
my $ipconfig = PVE::QemuServer::parse_ipconfig($conf->{"ipconfig$id"});
- my $mac = $net->{macaddr}
+ my $mac = lc($net->{macaddr})
or die "network interface '$iface' has no mac address\n";
- my $data = "${i}- type: physical\n"
- . "${i} name: eth$id\n"
- . "${i} mac_address: $mac\n"
- . "${i} subnets:\n";
+ $content .= "${i}- type: physical\n"
+ . "${i} name: eth$id\n"
+ . "${i} mac_address: $mac\n"
+ . "${i} subnets:\n";
$i .= ' ';
if (defined(my $ip = $ipconfig->{ip})) {
if ($ip eq 'dhcp') {
- $data .= "${i}- type: dhcp4\n";
+ $content .= "${i}- type: dhcp4\n";
} else {
- $data .= "${i}- type: static\n"
- . "${i} address: $ip\n";
+ my ($addr, $mask) = split_ip4($ip);
+ $content .= "${i}- type: static\n"
+ . "${i} address: $addr\n"
+ . "${i} netmask: $mask\n";
if (defined(my $gw = $ipconfig->{gw})) {
- $data .= "${i} gateway: $gw\n";
+ $content .= "${i} gateway: $gw\n";
}
}
}
if (defined(my $ip = $ipconfig->{ip6})) {
if ($ip eq 'dhcp') {
- $data .= "${i}- type: dhcp6\n";
+ $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";
} else {
- $data .= "${i}- type: static6\n"
+ $content .= "${i}- type: static\n"
. "${i} address: $ip\n";
if (defined(my $gw = $ipconfig->{gw6})) {
- $data .= "${i} gateway: $gw\n";
+ $content .= "${i} gateway: $gw\n";
}
}
}
-
- $content .= $data;
}
- my $nameserver = $conf->{nameserver} // '';
- my $searchdomain = $conf->{searchdomain} // '';
- my @nameservers = PVE::Tools::split_list($nameserver);
- my @searchdomains = PVE::Tools::split_list($searchdomain);
- if (@nameservers || @searchdomains) {
- my $i = ' ';
+ my $i = ' ';
+ my ($searchdomains, $nameservers) = get_dns_conf($conf);
+ if ($searchdomains || $nameservers) {
$content .= "${i}- type: nameserver\n";
- if (@nameservers) {
+ if (defined($nameservers) && @$nameservers) {
$content .= "${i} address:\n";
- $content .= "${i} - $_\n" foreach @nameservers;
+ $content .= "${i} - $_\n" foreach @$nameservers;
}
- if (@searchdomains) {
+ if (defined($searchdomains) && @$searchdomains) {
$content .= "${i} search:\n";
- $content .= "${i} - $_\n" foreach @searchdomains;
+ $content .= "${i} - $_\n" foreach @$searchdomains;
}
}
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;
'/network-config' => $network_data,
'/meta-data' => $meta_data
};
- commit_cloudinit_disk($vmid, $conf, $drive, $volname, $storeid, $files, 'cidata');
+ commit_cloudinit_disk($conf, $vmid, $drive, $volname, $storeid, $files, 'cidata');
}
my $cloudinit_methods = {
projects / qemu-server.git / blobdiff