From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 E6B392E3371 for ; Tue, 1 Apr 2025 01:00:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469219; cv=none; b=CQ2I6hG8yrHy349kxl8purFw5jPVS/4139hfjcc/OrmtVY09XeFq5K4NSRODFyU2Y5BE28mo+0l9/VCtCXhjQkXCYXMxmf2LJfGDKg0fpbeRy1FvbAeJYIJUP8rgZDFJMyKQQ4HWgGxua5CK2T+G8Z45Zr0sGergj2Mh7DdUoJc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469219; c=relaxed/simple; bh=5PMBFZyLkQxrNWxUcg1dwOnN40JgpNRF9AZcibTEskk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=twT2nfQjGxvlqw7cH3uyI4xC7iG9Al8k0MUxXC5jJb2C30xHgV1kD+/1WRAVB4XZ9wbf5PMLaP65ozladaaK49sd0levrxYWqYdShlyN3n3/plvOqaJONryAA+sdkhAfe/c5EGYvps0Wfs8ECIuAp/4+foijbrM96ZhtHoxdtHk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OS4IMlRd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OS4IMlRd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7242CC4AF09; Tue, 1 Apr 2025 01:00:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469218; bh=5PMBFZyLkQxrNWxUcg1dwOnN40JgpNRF9AZcibTEskk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OS4IMlRdOA5rT6giJUgrURo0HALiHVa71GVtuyOV8GBKIOT+tmG5sU68mnMHK2OaW fw+8lk9+J1lNtRkcJhr9h90xVMYV75gWzxOEyM7izYT0HOuEGp1Z4erJ+FS9K6Ero1 7COu4Ske+wFL8HQbZVGT/HRma/bjfvrp6+nKpWSDKaAP85YkuT6Icd27+JhZHYAFyn MXTMdrPhZSUhhjKmqJm7ZSbgVIidJKs7UUc03EFmoXHfx4/KnxdSLPHw3eFhvGXVVy DloUYfSHXdPFzTcw6zGgm6CU1vLfDL9Rpj1SyxpHX1zeKcP9JPhCmKsW2FfnHZy/gQ Bg/kjJr3abryw== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 19/31] terraform/OCI: Add a shape family selector Date: Mon, 31 Mar 2025 20:59:48 -0400 Message-ID: <20250401010000.764234-20-cel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250401010000.764234-1-cel@kernel.org> References: <20250401010000.764234-1-cel@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 From: Chuck Lever I'd like to add bare metal shapes too, but they seem to be in a separate family in the OCI documentation. Signed-off-by: Chuck Lever --- terraform/oci/kconfigs/Kconfig.compute | 23 ++++++++++++++++++++++ terraform/oci/kconfigs/shapes/Kconfig.flex | 4 ++++ 2 files changed, 27 insertions(+) diff --git a/terraform/oci/kconfigs/Kconfig.compute b/terraform/oci/kconfigs/Kconfig.compute index dc6427d18f42..281ef6d29c95 100644 --- a/terraform/oci/kconfigs/Kconfig.compute +++ b/terraform/oci/kconfigs/Kconfig.compute @@ -1,3 +1,26 @@ +choice + prompt "OCI shape family" + default TERRAFORM_OCI_SHAPE_FAMILY_FLEX + help + This option selects the class of virtual hardware (CPUs and + memory) to provision for each target node. Most CPU + architectures, including x86, run two threads per physical + core, so one OCPU is the equal of two vCPUs for x86-based + compute. + + Which shapes are available is limited by your subscription + and what hardware has been deployed in your selected region. + +config TERRAFORM_OCI_SHAPE_FAMILY_FLEX + bool "Flex shapes" + help + A flexible shape is a virtual machine that lets you + customize the number of OCPUs and the amount of memory + per instance. The network bandwidth and number of VNICs + scale proportionately with the number of OCPUs. + +endchoice + source "terraform/oci/kconfigs/shapes/Kconfig.flex" config TERRAFORM_OCI_OS_IMAGE_OCID diff --git a/terraform/oci/kconfigs/shapes/Kconfig.flex b/terraform/oci/kconfigs/shapes/Kconfig.flex index 5ecccf400c6b..67d50604bfcb 100644 --- a/terraform/oci/kconfigs/shapes/Kconfig.flex +++ b/terraform/oci/kconfigs/shapes/Kconfig.flex @@ -1,3 +1,5 @@ +if TERRAFORM_OCI_SHAPE_FAMILY_FLEX + choice prompt "OCI shape" default TERRAFORM_OCI_SHAPE_VM_STANDARD3_FLEX @@ -98,3 +100,5 @@ config TERRAFORM_OCI_INSTANCE_FLEX_MEMORY_IN_GBS Memory per instance, in GiBs. The minimum value for this setting is a multiple of the number of OCPUS in each instance. + +endif # TERRAFORM_OCI_SHAPE_FAMILY_FLEX -- 2.48.1