[RFC PATCH 17/31] terraform/OCI: Use "output yaml" for the OCPUs setting

[cel@kernel.org]

From: Chuck Lever <chuck.lever@oracle.com>

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 <chuck.lever@oracle.com>
---
 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