terraform/OCI: Use "output yaml" for the memory_in_gbs setting

Refactor:  Remove the line in terraform.Makefile that sets
"terraform_oci_instance_flex_memory_in_gbs" and just pass it
directly from Kconfig via an "output yaml" directive.

As an additional clean up, update the help text.

Reviewed-by: Luis Chamberlain <[email protected]>
Reviewed-by: Chandan Babu R <[email protected]>
Signed-off-by: Chuck Lever <[email protected]>

Author: chucklever

scripts/terraform.Makefile

@@ -48,7 +48,6 @@ KDEVOPS_MRPROPER += $(KDEVOPS_NODES)
 DEFAULT_DEPS_REQS_EXTRA_VARS += $(KDEVOPS_TFVARS)
 
 ifeq (y,$(CONFIG_TERRAFORM_OCI))
-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))
 TERRAFORM_EXTRA_VARS += terraform_oci_assign_public_ip=true

terraform/oci/kconfigs/shapes/Kconfig.flex

@@ -91,7 +91,10 @@ config TERRAFORM_OCI_INSTANCE_FLEX_OCPUS
 	  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"
+	int "Instance memory size"
+	output yaml
 	default 4
 	help
-	  How much GiB of RAM to use per flexible instance.
+	  Memory per instance, in GiBs. The minimum value for this
+	  setting is a multiple of the number of OCPUS in each
+	  instance.