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 31A915234 for ; Tue, 1 Apr 2025 01:00:17 +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=1743469218; cv=none; b=G0ffkLK0GTWQOsj50F36jVdcsjW4ORSIkSDL4WqEFDsKMkJweh+qSDW38y7ivLzC9/qbfx9zznBLosS0BFZC39pPGySsYJCkRPMFDuCNYXnDGAZOQ/QmQdMas7BoSNPIWJWICo0MQsLx1rhjcKNav+xMyds0l9ZplaNyYYXmrDQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469218; c=relaxed/simple; bh=/FZNx74x7FubHMKOu3j4wKaGpoOkRaTxjdqqhwt5kwQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fP3Pv/CKwXOR1Ooxgnzy1HGqkcZzLXorx9zMEz/nkXms5w5ypuijmCtoVzjS1PfrLmmzO25fvDYFCtD9Dwwhx48/7Jb91SSN1y38T1GzELU3jiCNnyaQsUBIriRqu2H5y2mSVujdzfmmI4uHNNpofyaAHvNtC5cGKNGNKyAeG38= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JDOyTgog; 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="JDOyTgog" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 48502C4CEE5; Tue, 1 Apr 2025 01:00:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469217; bh=/FZNx74x7FubHMKOu3j4wKaGpoOkRaTxjdqqhwt5kwQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JDOyTgogCg0oXtD/agNv/UlB4A8PPN5pRA79yZWATdV3VvEHcHysglk8o3J0Vcyxf uHi0loTV4F0ep1g1ztJRaPw2kIDVyqCxeoQvaOSisqig8w7pnjZq6pLhQ60Ta5Lwtl mzNjVIWKRsVUP1gQITgHVpIJZ1XTOlfaiqCkpN4yV9iPKiKPVIZOMiybvxm6G0mFFI FVj0vTxf1DsLtgp4ojWXv08J1rdATC8f9ef3TdZXST6XHtECSgTCLG/hxMRiq+CrSy ZuIIYh4E/hB34iroUin5qwOsWXmfaumre991ki1JG0gaLgIpYAH1XhFdcZO39Roq++ xifnpuZNRABrw== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 17/31] terraform/OCI: Use "output yaml" for the OCPUs setting Date: Mon, 31 Mar 2025 20:59:46 -0400 Message-ID: <20250401010000.764234-18-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 Refactor: Remove the line in terraform.Makefile that sets "terraform_oci_instance_flex_ocpus" and just pass it directly from Kconfig via an "output yaml" directive. As an additional clean up, update the help text. Signed-off-by: Chuck Lever --- scripts/terraform.Makefile | 1 - terraform/oci/kconfigs/shapes/Kconfig.flex | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index a1f510a33536..8e4973930125 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -95,7 +95,6 @@ TERRAFORM_EXTRA_VARS += terraform_gce_credentials=$(subst ",,$(CONFIG_TERRAFORM_ endif ifeq (y,$(CONFIG_TERRAFORM_OCI)) -TERRAFORM_EXTRA_VARS += terraform_oci_instance_flex_ocpus=$(subst ",,$(CONFIG_TERRAFORM_OCI_INSTANCE_FLEX_OCPUS)) TERRAFORM_EXTRA_VARS += terraform_oci_instance_flex_memory_in_gbs=$(subst ",,$(CONFIG_TERRAFORM_OCI_INSTANCE_FLEX_MEMORY_IN_GBS)) TERRAFORM_EXTRA_VARS += terraform_oci_os_image_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_OS_IMAGE_OCID)) ifeq (y, $(CONFIG_TERRAFORM_OCI_ASSIGN_PUBLIC_IP)) diff --git a/terraform/oci/kconfigs/shapes/Kconfig.flex b/terraform/oci/kconfigs/shapes/Kconfig.flex index 80ebccc59d6a..d37a498aacd9 100644 --- a/terraform/oci/kconfigs/shapes/Kconfig.flex +++ b/terraform/oci/kconfigs/shapes/Kconfig.flex @@ -73,10 +73,22 @@ config TERRAFORM_OCI_SHAPE default "VM.Optimized3.Flex" if TERRAFORM_OCI_SHAPE_VM_OPTIMIZED3_FLEX config TERRAFORM_OCI_INSTANCE_FLEX_OCPUS - int "Number of flexible instance OCPUs" + int "Instance CPU count" + output yaml default 2 help - The number of OCPUs to use per flexible instance. + The Oracle CPU (OCPU) represents physical CPU cores and is + the unit of measurement for CPUs on x86 CPUs (AMD and + Intel) and Arm CPUs (OCI Ampere Compute). A virtual CPU + (vCPU), the industry-standard for measuring compute + resources, represents one execution thread of a physical + CPU core. + + Most CPU architectures, including x86, runs two threads + per physical core, so one OCPU is the equal of two vCPUs + for x86-based compute. For OCI Compute, the minimum unit + of provisioning starts from one OCPU on both X86 (Intel + and AMD) and OCI Ampere Compute processors. config TERRAFORM_OCI_INSTANCE_FLEX_MEMORY_IN_GBS int "How much RAM to use per flexible instance in GB" -- 2.48.1