From nobody Thu Oct 5 15:54:36 2023 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 4S1bj91GZ2z4vs6f; Thu, 5 Oct 2023 15:54:37 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S1bj90LRJz3Lx9; Thu, 5 Oct 2023 15:54:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696521277; 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=XYA9MoCwefY1QO7OhgbLvze5egX85oFUnkbWC6ppYOk=; b=h8yzQSHiisrFnQ00lFCaXbvUjzX6uL51lXb3NWfybGhrafcAr3cx3fv8oLH+py06s3jXqd 59X0cormRFA35Ren6wNm9Q/IW3g2RWPKx8rw3NVVR98umo8mrpv0+FAp1uBSLyqi1aG4UJ OLjAdqHEjT313SA9yzHTuGBniMgPcN5ryLuwSyLwosvfnFb35gfPIcZ/Z/OsV/4PzG0Z5v oTH3yJYOb0kC1c5Ek4BaeDlZsGk4RHTJNylG9mDsdAySAq8X1xmpolFk4IwofFvFzvd6hu mpxcVJz1FbGr5dM9ii0S2s+CMUoGJDjSMFEGK3MYTac7icci1S26pdqaHz+yhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696521277; a=rsa-sha256; cv=none; b=hQnJZjp9I/gxjhcD4LMWXX56ffgx2oYq2yHtJ6HBBUPYowOB2AjtGd0c7fS3CTvlCoQiGA 2bpYk9xeGEOOZ3V1gYsCalsH/e9JArKDxgWBaRd10pnXxVYVR29xkNCtajn5LNhNre/5TM /vKGDvoJOB9w2A437pha/C7NbSsBgSpng+mAb8NodCZvLW+0fJGjUme5Na1GFlO9lzdZgV XOZG245N4Bfd+JZYFgcD+330fq+/5S3B4jttfazEEK3Dc0OriELrONPfbWp+oWUSKUdAWE YkzTr/vHCVHWi7OaFD2Ggp1CJG2g4K9ZdQVEeQDDh1xpha1SFN7oYmTglcOGkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696521277; 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=XYA9MoCwefY1QO7OhgbLvze5egX85oFUnkbWC6ppYOk=; b=McvykfMR+5Dc3rtE/HODrVqazQuemPVfhM3fwM6f98XK7T1CvBMECuqKQMMfydSir9MK62 fT/dNcDNo4hVpH/0PoBczvjo5Pak9tBZ4k8Yytw4ks3LerEPz6EH6D9tofSgneiAotQQmH Zm/3n8V07/CyQqSgM6b71G+Z+ohwi936YCyK3lTZX1p0H49l8/F+JCCuI2+nFDZCtJcSQn fEa2iijaDcW+C38YGVJPExL9RhJk5fd2vcWdcINHAy1MnUyfqfMS2KLTEebyLTaYiQIRaW 6MhwdWihQWm0O28I035ZELXIJ+bs5ExlACXKqIWMd8Z3c11KmD3Ob4cN0mM8QQ== 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 4S1bj86P4Pz1Qck; Thu, 5 Oct 2023 15:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 395Fsamr046808; Thu, 5 Oct 2023 15:54:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 395FsatF046805; Thu, 5 Oct 2023 15:54:36 GMT (envelope-from git) Date: Thu, 5 Oct 2023 15:54:36 GMT Message-Id: <202310051554.395FsatF046805@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: bdd892341813 - releng/14.0 - EC2: Add experimental cloud-init images 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: bdd89234181337347ea6a81677875fc676325380 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=bdd89234181337347ea6a81677875fc676325380 commit bdd89234181337347ea6a81677875fc676325380 Author: Colin Percival AuthorDate: 2023-09-09 00:55:16 +0000 Commit: Colin Percival CommitDate: 2023-10-05 15:54:04 +0000 EC2: Add experimental cloud-init images Known issues: 1. The ec2-user user is created with a homedir of /usr/home/ec2-user instead of /home/ec2-user; this appears to be a bug in cloud-init's FreeBSD support. 2. Cloud-init configures IPv4 networking but not IPv6 networking. Approved by: re (gjb) Relnotes: yes Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D41793 (cherry picked from commit 1f4ce7a39f0f4b0621ff55d228014ccddb366d37) (cherry picked from commit d9243c1ab3cd8e744aaf54177232cdbffa07392d) --- release/Makefile.vm | 5 +++-- release/tools/ec2-cloud-init.conf | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 8828b99599e7..09e31e3c0b6f 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -30,8 +30,9 @@ BASIC-CI_FSLIST= ufs BASIC-CI_DESC= Image for CI EC2_FORMAT= raw EC2_FSLIST= ufs zfs -EC2_DESC= Amazon EC2 image -EC2_FLAVOURS= BASE +EC2_FLAVOURS= BASE CLOUD-INIT +EC2-BASE_DESC= Amazon EC2 image +EC2-CLOUD-INIT_DESC= Amazon EC2 Cloud-Init image GCE_FORMAT= raw GCE_FSLIST= ufs GCE_DESC= Google Compute Engine image diff --git a/release/tools/ec2-cloud-init.conf b/release/tools/ec2-cloud-init.conf new file mode 100644 index 000000000000..2dd4df390fa3 --- /dev/null +++ b/release/tools/ec2-cloud-init.conf @@ -0,0 +1,31 @@ +#!/bin/sh + +. ${WORLDDIR}/release/tools/ec2.conf + +# Packages to install into the image we're creating. In addition to packages +# present on all EC2 AMIs, we install cloud-init. +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} net/cloud-init" + +# Services to enable in rc.conf(5). +export VM_RC_LIST="${VM_RC_LIST} cloudinit sshd" + +vm_extra_pre_umount() { + # Configuration common to all EC2 AMIs + ec2_common + + # Configure cloud-init + cat <<-'EOF' > ${DESTDIR}/usr/local/etc/cloud/cloud.cfg.d/98_ec2.cfg + disable_root: true + system_info: + distro: freebsd + default_user: + name: ec2-user + lock_passwd: True + groups: [wheel] + shell: /bin/sh + # Currently broken, cloud-init hard-codes to /usr/home/* + homedir: /home/ec2-user + EOF + + return 0 +}