[RFC PATCH 19/31] terraform/OCI: Add a shape family selector

[cel@kernel.org]

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

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