From nobody Sat Jun 14 18:57:02 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bKQVQ5gMcz5pfKh; Sat, 14 Jun 2025 18:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bKQVQ3sn9z4K77; Sat, 14 Jun 2025 18:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749927422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6g33ywo/4w2botSkGFnBQS9E3IzSH6m+0k1dPIZdGrQ=; b=HHqlpErdlPlefv7L3GfOf8zGf3FRCJpUM2ie+KWUX3hFyITt9C5kUVe71fDpU5pdVZFQDp wjqJ1/bynk06k8Ty77u0Jpo/V3rVdRMeu5ZjxroL0cs4IpI/+w54/SvA/HQEDxdOpdxDbC 1XzLQ1mXXZtQJONmwPvmgX0GRCxtxkvG2zBRv2Jzbkvvj+ciwQ7rqh0Khu2As0DUlTJcXu +kRIkrx2aGhH5xQClrpDXf6sE2jgG8YTTO2GhFrnTZY0ncXLT3+OKnQ/B8maFgkOqmDtWg pXfxig29pwENamdbFeG8CcrryLVFQHuBqKD+xt5dkr6WIYOm14vmvEzxvIP27g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749927422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6g33ywo/4w2botSkGFnBQS9E3IzSH6m+0k1dPIZdGrQ=; b=x8/69xA5/xkiJoh7s7uXnnug4drw4y8CDPmpUyXIe/eweRAxN4duk7f6P8IStB7MBKGrMB S/Y6AvekDH6RHdTlEqvoRUe3jBO7ntI5FCYe7g2udU2oNVSwqNrWcsQLjwhA+/oXLOKJc/ bPTFDPQaPhHiRmWouuodjIqwuCZmzXW/hFBW9MeDXx4vG1IAszj0fow2+D1vv488h0BKq8 0KfzhmbxZwdZIGYDP9MoFCrcchyKaPC9twNfIfkhVO2apCOxmVR9QG9CpMz0WuOqBLX4FS PFSnCGAkXsf62BYNE/1ONMXFD9QnCeKIOW0l/LwSLT6WnEHxtkE4UEtjii5QnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749927422; a=rsa-sha256; cv=none; b=puSrTo0IR6Uy30aGJhj/1UB+ySUI4+QKJCOIfIO6HzRUsLCsjqfI/8QRdSxwhHz29AjBTF T/9enNEQ0Fw0WCnrmK1LxAi54pKxIIG9s9e7kbUtHVZlHtOOfis7nxeopF9TqrLEzaRbAK O122PCSbTAOMFN/2sDBlRzOFI4vDwl3vaArRLtj/+tJm9km3Ywjy8yuZx0t/LmsVNbQz8k sopo32lBKs5EXowh7zfziEnw5acONjeAomwjqmQpl1JN7v8xJqbPYoRTeJ5A0Pb+8HvNce MrlV3nFpZV7kuYE4Um94MREDk4m+kgYPkCJw+pBg6MmGurfs6NRFQXi2OkrdUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bKQVQ3SzqzgGJ; Sat, 14 Jun 2025 18:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55EIv2OF062952; Sat, 14 Jun 2025 18:57:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55EIv2hP062949; Sat, 14 Jun 2025 18:57:02 GMT (envelope-from git) Date: Sat, 14 Jun 2025 18:57:02 GMT Message-Id: <202506141857.55EIv2hP062949@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: f1dd507b2c44 - main - nuageinit: support "fqdn" and "hostname" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1dd507b2c44f16c94395e67f82125c491ebddf2 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=f1dd507b2c44f16c94395e67f82125c491ebddf2 commit f1dd507b2c44f16c94395e67f82125c491ebddf2 Author: Baptiste Daroussin AuthorDate: 2025-06-14 18:49:44 +0000 Commit: Baptiste Daroussin CommitDate: 2025-06-14 18:56:59 +0000 nuageinit: support "fqdn" and "hostname" --- libexec/nuageinit/nuageinit | 6 ++++++ libexec/nuageinit/tests/nuageinit.sh | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index c874f40b38a8..c1026aa2afee 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -249,6 +249,12 @@ if line == "#cloud-config" then if not obj then nuage.err("error parsing cloud-config file: " .. ud) end + -- always prefer fqdn is specified over hostname + if obj.fqdn then + nuage.sethostname(obj.fqdn) + elseif obj.hostname then + nuage.sethostname(obj.hostname) + end if obj.groups then for n, g in pairs(obj.groups) do if (type(g) == "string") then diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 3d0033a648de..edcc80346b5d 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -28,6 +28,7 @@ atf_test_case config2_userdata_packages atf_test_case config2_userdata_update_packages atf_test_case config2_userdata_upgrade_packages atf_test_case config2_userdata_shebang +atf_test_case config2_userdata_fqdn_and_hostname setup_test_adduser() { @@ -837,6 +838,26 @@ EOF fi } +config2_userdata_fqdn_and_hostname_body() +{ + mkdir -p media/nuageinit + setup_test_adduser + printf "{}" > media/nuageinit/meta_data.json + cat > media/nuageinit/user_data < media/nuageinit/user_data <