cloud-init: nocloud v1: set ip and netmask instead of cidr

[qemu-server.git] / PVE / QemuServer / Cloudinit.pm

diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm
index dc55d2d8c216471ad62422fffb57a1478a17ddf3..b63d010e60d7a25d166d6812a99c474c706db43a 100644 (file)
--- a/PVE/QemuServer/Cloudinit.pm
+++ b/PVE/QemuServer/Cloudinit.pm
@@ -12,7 +12,7 @@ use PVE::Storage;
 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;
@@ -30,13 +30,15 @@ sub commit_cloudinit_disk {
     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 = $@;
@@ -63,8 +65,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,13 +98,14 @@ 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";
 
     $content .= "hostname: $hostname\n";
+    $content .= "manage_etc_hosts: true\n";
     $content .= "fqdn: $fqdn\n" if defined($fqdn);
 
     my $username = $conf->{ciuser};
@@ -134,6 +137,13 @@ sub cloudinit_userdata {
     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) = @_;
 
@@ -162,10 +172,10 @@ sub configdrive2_network {
            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};
            }
        }
@@ -198,7 +208,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;
@@ -211,7 +221,7 @@ sub generate_configdrive2 {
        '/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 {
@@ -318,8 +328,10 @@ sub nocloud_network {
            if ($ip eq 'dhcp') {
                $content .= "${i}- type: dhcp4\n";
            } else {
+               my ($addr, $mask) = split_ip4($ip);
                $content .= "${i}- type: static\n"
-                      . "${i}  address: $ip\n";
+                         . "${i}  address: $addr\n"
+                         . "${i}  netmask: $mask\n";
                if (defined(my $gw = $ipconfig->{gw})) {
                    $content .= "${i}  gateway: $gw\n";
                }
@@ -363,7 +375,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;
@@ -376,7 +388,7 @@ sub generate_nocloud {
        '/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 = {