From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B591F36D for ; Fri, 8 Mar 2024 00:04:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709856243; cv=none; b=PmKaJiEL+/CX023OwPlZ5ZiyxRKENRBo5nhPach1XgkYeaeDWBCsCy8fOW4yBaeYuDWTRvRgQK/e7XmSuAFCiCtbpN4Q5ETFRa5NjdMVJRCEXlOHJbePpDypGRhHixfbiqovO0kIZIUARoHssY4/IFnoTQxMbgufiUsaf8bIiWM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709856243; c=relaxed/simple; bh=B5Om0EKPM2iwpKmJ4BLbph5DRGM/mjREXxe73RhLIaA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=n5K7pZx9Xw8E4cWI4RcbznSUiCm7nkoWF0C37IXpIxy7bNfjy2S8sKDYrzVtGaRzj6L2/Ui6n9SZ7sfFqA3SosCosEIV41L8Z0036kOnkgT8WyebOmPf/KP1RxDIBZaBUWufivh9GpiqBiILCq/YLT6XX8ydv6WUmE2KQyYTZl8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=QuPvezzJ; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="QuPvezzJ" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=e7pOOOYr3x/RGaem+e/LRVdoRSezIKup1kxlpCyg7gE=; b=QuPvezzJ9u06fuVOK/DYa9PhJU kUjFaC53ITSf3Sd7+qbBFn2hLi0K1Dbui9v9Y+tfWcTGqHFErzP50JVib91RrQBHPM/GHLKCwRzaM UkCYBN/MGg8xfHD2roVqt5QsyfyjUvwOiEOD2Ad11N6QT2SLDkf604P8cAR2mrhiENxLSoBstHDEb OSQwOLTFT66Hhau8XPl5Mqj6MGu/BoJ2e3QjwHq0Tk3WhXOQJ2dX6fMzdExjgkW/Ig7nlIfWampiG 6YcRSKJn8zAkIGqTWSLc46KOEaOM6YiswRZ29oZc0U2u6dBRKCtLgHikULD4NgW1AN4PvekMM8PiK MeKVRyAw==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1riNiT-00000006uQX-11xH; Fri, 08 Mar 2024 00:04:01 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev Cc: Luis Chamberlain Subject: [PATCH 5/8] bringup: match default distro to user's distro Date: Thu, 7 Mar 2024 16:03:56 -0800 Message-ID: <20240308000400.1646823-6-mcgrof@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240308000400.1646823-1-mcgrof@kernel.org> References: <20240308000400.1646823-1-mcgrof@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Luis Chamberlain We've had kconfigs/Kconfig.distro for a while which let's us pick up on the distro the user of kdevops is using but haven't used it extensively. Heavy users of kdevops want sensible defaults so you have to do less configuration of kdevops, one of the things we could do to make things smoother is match the target distro to use with the user's distro. So do that and be consistent over vagrant / guestfs and promote the same best practice when using terraform to use the cloud. Signed-off-by: Luis Chamberlain --- kconfigs/Kconfig.guestfs | 4 +++- terraform/aws/Kconfig | 1 + terraform/azure/Kconfig | 2 +- terraform/gce/Kconfig | 3 ++- terraform/openstack/Kconfig | 2 +- vagrant/Kconfig | 4 +++- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/kconfigs/Kconfig.guestfs b/kconfigs/Kconfig.guestfs index 58c0c69a..03e0fb86 100644 --- a/kconfigs/Kconfig.guestfs +++ b/kconfigs/Kconfig.guestfs @@ -2,7 +2,9 @@ if GUESTFS choice prompt "Guestfs Linux distribution to use" - default GUESTFS_FEDORA + default GUESTFS_FEDORA if DISTRO_FEDORA || DISTRO_REDHAT + default GUESTFS_FEDORA if DISTRO_OPENSUSE || DISTRO_SUSE + default GUESTFS_DEBIAN if DISTRO_DEBIAN || DISTRO_UBUNTU config GUESTFS_FEDORA bool "Fedora (or derived distro)" diff --git a/terraform/aws/Kconfig b/terraform/aws/Kconfig index 9f4f9070..db8a5f76 100644 --- a/terraform/aws/Kconfig +++ b/terraform/aws/Kconfig @@ -96,6 +96,7 @@ config TERRAFORM_AWS_AV_REGION choice prompt "AWS AMI owner" + default TERRAFORM_AWS_AMI_DEBIAN if DISTRO_DEBIAN default TERRAFORM_AWS_AMI_AMAZON_X86_64 if TARGET_ARCH_X86_64 default TERRAFORM_AWS_AMI_AMAZON_ARM64 if TARGET_ARCH_ARM64 diff --git a/terraform/azure/Kconfig b/terraform/azure/Kconfig index 97513c7a..30acefd3 100644 --- a/terraform/azure/Kconfig +++ b/terraform/azure/Kconfig @@ -80,7 +80,7 @@ if TERRAFORM_AZURE_IMAGE_PUBLISHER_DEBIAN choice prompt "Azure image offer" - default TERRAFORM_AZURE_IMAGE_OFFER_DEBIAN_10 + default TERRAFORM_AZURE_IMAGE_OFFER_DEBIAN_10 if DISTRO_DEBIAN config TERRAFORM_AZURE_IMAGE_OFFER_DEBIAN_10 bool "debian-10" diff --git a/terraform/gce/Kconfig b/terraform/gce/Kconfig index df17078d..6fedb2bc 100644 --- a/terraform/gce/Kconfig +++ b/terraform/gce/Kconfig @@ -57,7 +57,8 @@ config TERRAFORM_GCE_SCRATCH_DISK_INTERFACE config TERRAFORM_GCE_IMAGE string "GCE image to use" - default "debian-cloud/debian-10" + default "debian-cloud/debian-10" if DISTRO_DEBIAN + default "debian-cloud/debian-10" if !DISTRO_DEBIAN help This option will set GCE image to debian-cloud/debian-10. diff --git a/terraform/openstack/Kconfig b/terraform/openstack/Kconfig index 9b1f324d..61167ad1 100644 --- a/terraform/openstack/Kconfig +++ b/terraform/openstack/Kconfig @@ -47,7 +47,7 @@ endchoice config TERRAFORM_OPENSTACK_IMAGE_NAME string "OpenStack image name" - default "Debian 10 ppc64le" if TERRAFORM_OPENSTACK_IMAGE_DEBIAN_10_PPC64LE + default "Debian 10 ppc64le" if TERRAFORM_OPENSTACK_IMAGE_DEBIAN_10_PPC64LE && DISTRO_DEBIAN help This option will set OpenStack image name to use. diff --git a/vagrant/Kconfig b/vagrant/Kconfig index fc322438..b5abba76 100644 --- a/vagrant/Kconfig +++ b/vagrant/Kconfig @@ -97,7 +97,9 @@ config HAVE_SUSE_VAGRANT choice prompt "Vagrant guest Linux distribution to use" - default VAGRANT_DEBIAN if !HAVE_SUSE_VAGRANT + default VAGRANT_DEBIAN if DISTRO_DEBIAN || DISTRO_UBUNTU + default VAGRANT_FEDORA if DISTRO_FEDORA + default VAGRANT_OPENSUSE if DISTRO_OPENSUSE default VAGRANT_SUSE if HAVE_SUSE_VAGRANT config VAGRANT_DEBIAN -- 2.43.0