From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id B16D268D45 for ; Fri, 10 Sep 2021 20:34:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9DF1B17CEB for ; Fri, 10 Sep 2021 20:34:07 +0200 (CEST) Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 3490717CDF for ; Fri, 10 Sep 2021 20:34:06 +0200 (CEST) Received: by mail-lj1-x235.google.com with SMTP id q21so4667412ljj.6 for ; Fri, 10 Sep 2021 11:34:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jyqinflXgHo1qLI/WRKmBDmZGby6swN+mc0IN3Q2CsE=; b=K4yQcYlQGdrPjS24KjicjAXBj5cx0/RSeB1zSmQqQ0ONvIB64qw89Wy0BHZjc/4zmh mmWHAB3IOpKmWOmgG7wXWZ13z2gKMOi6aqV1dAjpvSbhfwwCLalq8Pio9n0DB4/VR/ig sQZXBPzmCl85sbf4CNiGu/Is1UUPBS5bALyP5CgziANGCIylOEpNy1PS7VTsWz37sACG fvy6bFHd8iI+xmFpBRb3OF8SXCXDuO12sTOSe1fx8urI0ZCIaS0q7Qk1bEJswKb/VRiF JDrU7nh/pTV5YAyRid76G4CRf/HiQ4FLQP9m21h7TRmCD36LDg2Hhol9J9TZY4/KrLMa PaIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jyqinflXgHo1qLI/WRKmBDmZGby6swN+mc0IN3Q2CsE=; b=wMgSzaCYYfdAVT+hU2I5OvCM3C5E0NVtY3iaoPR8Z1F6Fgc2BahlTVsNmhOINaJDuL siIc4DdUJ1roa+5q/93gd+AbyNiaArJGiozxiIQmnX611kurhMn4gmKmWX2fuw2qOCbr Gz6Zc1evucv0VZ/6DdYRAwjCrL++MfZQctFj65rtruGsvSt5aL8Ds/mspo7uTgAOFZJF rqraKA6dAfbJvSV4pMDCbG1J/A06s9sCHu0CnJ96855s0Xhz+Y0/LxaxAGxYtTC7i+3k rfC7XCbyu1DqiQ4NAFFsufp7LVZg3DXz+jtGJZhkxgRWt0mSJkDL7h3tQJ9gQdOdAYqf Au1Q== X-Gm-Message-State: AOAM530Sr2DUQZ4DQ5FEVdgangQyGPQQAsHb22O5VOE3o8gY6+BFpmsz 2PbVOKdpZo8jKrpmX1qj7IDxFLHXzj0= X-Google-Smtp-Source: ABdhPJw77qbYaBgNgp4Jy1XNpyX8aiw2tm2SFTuQIwJiFSOrZJMGrLOHnfflIWPniD8RoNI0DEU8sw== X-Received: by 2002:a2e:b60f:: with SMTP id r15mr5231391ljn.330.1631298839383; Fri, 10 Sep 2021 11:33:59 -0700 (PDT) Received: from HiMini.lan (38-14-191-90.dyn.estpak.ee. [90.191.14.38]) by smtp.gmail.com with ESMTPSA id v124sm628316lfa.205.2021.09.10.11.33.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Sep 2021 11:33:59 -0700 (PDT) From: Serge Logvinov X-Google-Original-From: Serge Logvinov To: pve-devel@lists.proxmox.com Cc: Serge Logvinov Date: Fri, 10 Sep 2021 21:33:43 +0300 Message-Id: <20210910183343.69805-2-serge.logvinov@sinextra.dev> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20210910183343.69805-1-serge.logvinov@sinextra.dev> References: <20210910183343.69805-1-serge.logvinov@sinextra.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 BAYES_00 -1.9 Bayes spam probability is 0 to 1% DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's domain DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from domain FREEMAIL_FROM 0.001 Sender email is commonly abused enduser mail provider RCVD_IN_DNSWL_NONE -0.0001 Sender listed at https://www.dnswl.org/, no trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [cloudinit.pm] X-Mailman-Approved-At: Mon, 13 Sep 2021 09:51:21 +0200 Subject: [pve-devel] [PATCH container 1/1] feat: set hostname to meta X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Sep 2021 18:34:07 -0000 Add hostname property in meta-data (nocloud method). Now only user-data has hostname of VM. If you redifine user-data, you lost the hostname. Signed-off-by: Serge Logvinov --- PVE/QemuServer/Cloudinit.pm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm index a5474d3..b1df93d 100644 --- a/PVE/QemuServer/Cloudinit.pm +++ b/PVE/QemuServer/Cloudinit.pm @@ -479,15 +479,15 @@ sub nocloud_network { } sub nocloud_metadata { - my ($uuid) = @_; - return "instance-id: $uuid\n"; + my ($uuid, $hostname) = @_; + return "instance-id: $uuid\nhostname: $hostname\n"; } sub nocloud_gen_metadata { - my ($user, $network) = @_; + my ($user, $network, $hostname) = @_; my $uuid_str = Digest::SHA::sha1_hex($user.$network); - return nocloud_metadata($uuid_str); + return nocloud_metadata($uuid_str, $hostname); } sub generate_nocloud { @@ -498,7 +498,8 @@ sub generate_nocloud { $network_data = nocloud_network($conf) if !defined($network_data); if (!defined($meta_data)) { - $meta_data = nocloud_gen_metadata($user_data, $network_data); + my ($hostname, $fqdn) = get_hostname_fqdn($conf, $vmid); + $meta_data = nocloud_gen_metadata($user_data, $network_data, $hostname); } my $files = { @@ -589,7 +590,8 @@ sub dump_cloudinit_config { my $user = cloudinit_userdata($conf, $vmid); if ($format eq 'nocloud') { my $network = nocloud_network($conf); - return nocloud_gen_metadata($user, $network); + my ($hostname, $fqdn) = get_hostname_fqdn($conf, $vmid); + return nocloud_gen_metadata($user, $network, $hostname); } else { my $network = configdrive2_network($conf); return configdrive2_gen_metadata($user, $network); -- 2.24.3 (Apple Git-128)