[PATCH 5/8] bringup: match default distro to user's distro

[Luis Chamberlain <mcgrof@kernel.org>]

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 <mcgrof@kernel.org>
---
 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