From nobody Wed Sep 17 19:42:24 2025 X-Original-To: dev-commits-src-branches@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 4cRq0x3nDHz67xNZ; Wed, 17 Sep 2025 19:42:25 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRq0x1Gx8z4GnN; Wed, 17 Sep 2025 19:42:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758138145; 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=MfuZ35f4zVM1bUkJph7NITkaxO+QnD5yfoP+KDhzmOs=; b=Kam33lw4mEVs0fysFnYeL5CIDzJGl06RZpNHC8xMD2mvKt3KrbOUxsLVI5gtxdhrPN7sJx wzqH8H/+RPsdRLOjCiEYS7OMhtKCnkqYBzgV/7Se+wgJ0cXMNCjfTep8wkUIndnxyG26lJ kDmcPHDMzFutz+yBngJ1jV/SaTKW7RESPyBjb6jDRr6UBpCs5fIzYnF/pb/H+Ah85z1cGY kxEV1NDx3cPvRpEa6WivYPcaCa5VoN2PZ4uls0nYllnkEsILZrNEcb3pSbcqWLRmMBY5Xv M+9rBpzX751oApEaqJxktGIxEpuwawoCz87Ch9fZVyrUhAmIBpad/txMGlf9YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758138145; 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=MfuZ35f4zVM1bUkJph7NITkaxO+QnD5yfoP+KDhzmOs=; b=f5S/SLjpqlxSqlajzwVbaEqH8euv+pg2uOWl2c8vA2bvEvJYgiJSCSRoYIeZ1eyfBmyQdZ bSqc5bniK2fQ+yRL7IirkPUfhqp8Cr1cuh1m0cxto8IIqQMZEHoPmV0hxpC36DE4sUUsEG insNKuF5F7iatCizlsVdlZ0Yz4uq9NOXP3Dd/s4IaA8vZ1uXayRqrzI+cj9BeCteC1lGlo 5EIuI8dxJe6iB30Zuv1pj5L81U3A8FTI7fr8uahxQz5/obll0r1ejgcnoznbKPfaOuCx5w vBQkRCXS2e3xKHP39Khz4vnvfbBZrQflU4HuKNT0SpMcI8NOyoKfcQ2Fd+kAiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758138145; a=rsa-sha256; cv=none; b=ETBGZ53/GYw1EnqXCvdG36lBs/EN3fJvI7KohM61p2EbgVnbzpPyi4klnfi4iuOfXw/GzZ i0zCnP1NAgYIpQCLoJcGgTMWuNQdWqmAaxCL+Ika2tQWHlIDvINe1NubVQV+auGZfvGmh7 5qN1X45Y0mu9Q6r42Ae+6LBOphp2gdaxum2A9c2Mc6NNmyGsObeGBNSbpL6urCHknmiIlo QJ6XbLSBYGOz+FFxkjiY2cGu1/L9xYb62hF/SbgAuZNMAq52spQsGQyxsUdkG+k2W3Zcwa m8jkJTj1+yuPo92/azRFC0TfixIsNeaWt1tZ9XrTRIo8a3tBJ/S30x+5QJRE1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRq0x0f7wzg8x; Wed, 17 Sep 2025 19:42:25 +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 58HJgOnQ032145; Wed, 17 Sep 2025 19:42:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HJgOlb032142; Wed, 17 Sep 2025 19:42:24 GMT (envelope-from git) Date: Wed, 17 Sep 2025 19:42:24 GMT Message-Id: <202509171942.58HJgOlb032142@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: bf187f6ac5b1 - stable/14 - nuageinit: Allow the use of network parameters from network-config List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: bf187f6ac5b198d51b3db80c8876fc70ce75b162 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=bf187f6ac5b198d51b3db80c8876fc70ce75b162 commit bf187f6ac5b198d51b3db80c8876fc70ce75b162 Author: Jesús Daniel Colmenares Oviedo AuthorDate: 2025-09-11 16:52:30 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-17 19:39:24 +0000 nuageinit: Allow the use of network parameters from network-config To better comply with the cloud-init specification, we need to support the configuration of network-related parameters from the network-config file, which is common in most deployments. Reviewed by: bapt@ Approved by: bapt@ Differential Revision: https://reviews.freebsd.org/D52419 (cherry picked from commit 95230b248f6412c2d1c416c1e9795c3192cdf750) --- libexec/nuageinit/nuageinit | 31 ++++++++++++++++++++++++++++++- libexec/nuageinit/nuageinit.7 | 7 +++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index c94eb822ba0f..5541f6d0f164 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -583,6 +583,26 @@ local function config2_network(p) routing:close() end +local function parse_network_config() + local nc_file = ni_path .. "/network-config" + local nc_file_attr = lfs.attributes(nc_file) + if nc_file_attr == nil then + return + end + local f, err = io.open(nc_file) + if err then + nuage.err("error parsing nocloud network-config: " .. err) + end + local obj = yaml.load(f:read("*a")) + f:close() + if not obj then + nuage.err("error parsing nocloud network-config") + end + local netobj = {} + netobj["network"] = obj + return netobj +end + if citype == "config-2" then local parser = ucl.parser() local res, err = parser:parse_file(ni_path .. "/meta_data.json") @@ -679,7 +699,16 @@ if line == "#cloud-config" then end for i = 1, #calls_table do - calls_table[i](obj) + if citype == "nocloud" and calls_table[i] == network_config then + netobj = parse_network_config() + if netobj == nil then + network_config(obj) + else + network_config(netobj) + end + else + calls_table[i](obj) + end end elseif line:sub(1, 2) == "#!" then -- delay for execution at rc.local time -- diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index f02829618f44..8d9aac3d3809 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -183,6 +183,13 @@ configuration in .Pa /etc/ssh/sshd_config .It Ic network Network configuration parameters. +.Pp +Specifying the following parameters from a file named +.Pa network-config +takes precedence over their specification from the +.Ic network +parameter of +.Pa user-data Ns . .Bl -tag -width "ethernets" .It Ic ethernets Mapping representing a generic configuration for existing network interfaces.